22298 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f0077d4c42 Merge branch 'MDL-56316-master' of git://github.com/andrewnicols/moodle 2016-10-10 18:11:56 +02:00
David Monllao
97f1af7575 Merge branch 'MDL-56050-master' of git://github.com/lameze/moodle 2016-10-10 23:14:43 +08:00
David Monllao
886207f70e Merge branch 'MDL-55923-master' of git://github.com/jleyva/moodle 2016-10-10 22:57:34 +08:00
Dan Poltawski
5f85134187 Merge branch 'MDL-55999-master' of git://github.com/lameze/moodle 2016-10-10 13:40:16 +01:00
Dan Poltawski
0b7aef7b20 Merge branch 'MDL-51584' of https://github.com/mr-russ/moodle 2016-10-10 13:23:59 +01:00
Frédéric Massart
fc72f49da3 MDL-56095 output: Moving progress_bar from weblib to outputcomponents
And revert the change in the order of the require_once in setup.php.
2016-10-10 13:25:37 +02:00
Dan Poltawski
80156d01c4 Merge branch 'MDL-56095-master-2nd' of git://github.com/FMCorz/moodle 2016-10-10 10:09:46 +01:00
David Monllao
e8cd446ecd Merge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle 2016-10-10 16:59:06 +08:00
Russell Smith
82905c097c MDL-51584 gradebook: use direct $CFG access for freeze.
get_config() is called a lot of times on freeze and is expensive,
using $CFG is much lower overhead.
2016-10-10 15:42:04 +11:00
Frédéric Massart
82b945dbbe MDL-56095 output: Make the progress bar templatable
The order of inclusion of weblib and outputlib had to change
as the progress_bar (weblib) uses interfaces defined in outputlib.
2016-10-07 16:40:38 +02:00
Andrew Nicols
070015004e MDL-56316 tests: Ensure consistent assertion count 2016-10-07 14:45:36 +08:00
Eloy Lafuente (stronk7)
85ef6fe2d9 MDL-56097 install: update the list of stale files for 3.2 2016-10-07 00:41:11 +02:00
Dan Poltawski
636ec5010f MDL-56306 tests: make upgrade_util_test compatible with travis 2016-10-06 18:01:43 +01:00
Dan Poltawski
586cf92909 MDL-45388 admin: warn of themedesignermode in /admin/ and perf footer
This is:
a) To help avoid devs going on a wild goose chase to find a perf issue
when it's caused by css building
b) To make it clearer that this should never be enabled on production
sites (we already have a warning in the performance report, but who
looks at that)

Now that boost is the default theme and builds css itself, it's more
critical.
2016-10-06 11:49:17 +01:00
Eloy Lafuente (stronk7)
b79069d233 NOBUG: Fixed file access permissions 2016-10-06 11:51:28 +02:00
Dan Poltawski
c6c50e04d9 MDL-22078 lib: bump redirect_if_major_update_required()
Changes to the course table enforce an update
2016-10-06 09:24:52 +01:00
Rajesh Taneja
904306389f
MDL-55713 behat: Include named and partial behat selector files 2016-10-06 07:55:51 +08:00
Juan Leyva
6a09295857 MDL-55923 webservice: Add global setting for forcing token deletion 2016-10-05 20:34:01 +01:00
Eloy Lafuente (stronk7)
adc77f07c5 Merge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle 2016-10-05 12:22:07 +02:00
David Monllao
5be1491759 Merge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle 2016-10-05 15:51:43 +08:00
Rajesh Taneja
86ebbed6ca
MDL-56210 behat: Test for disabled button later
With phantomjs, dom is not updated by the time
next step is executed, so suffle it to ensure
this scenario pass
2016-10-05 15:45:22 +08:00
Andrew Nicols
d98217550b MDL-55713 behat: Bad rebase conflict resolution fix 2016-10-05 15:19:07 +08:00
Andrew Nicols
4187b3e521 MDL-55713 behat: Correct all references to selectortype 2016-10-05 14:10:26 +08:00
David Monllao
8643c576c7 MDL-22078 course: Complete proposed patch
- New site setting to define the default course duration (used to set
  the default end date for some course formats)
- End date setting out of restore
- Fix tool_uploadcourse
- Other fixes here and there
2016-10-05 12:31:05 +08:00
Andrew Nicols
b31984d5a2 MDL-55713 2016-10-05 11:46:49 +08:00
Simey Lameze
a4ea86f65a MDL-56050 core: set missing context to maintenance mode 2016-10-05 11:23:38 +08:00
Andrew Nicols
6ee51d010f MDL-55713 behat: Correct copy/paste error 2016-10-05 11:04:56 +08:00
Simey Lameze
9a15bf217f MDL-55999 lib: Update thirdpartylibs.xml and readme_moodle.txt 2016-10-05 10:58:10 +08:00
Simey Lameze
f7035bb964 MDL-55999 lib: Update ADOdb to version 5.20.7 2016-10-05 10:57:42 +08:00
Andrew Nicols
2a864ee9a8 Merge branch 'MDL-56092-master' of git://github.com/jleyva/moodle 2016-10-05 08:30:35 +08:00
Eloy Lafuente (stronk7)
7ad3d5db04 Merge branch 'MDL-56231-32-flexible_table-construct-phpdoc' of https://github.com/roperto/moodle 2016-10-05 01:48:49 +02:00
Eloy Lafuente (stronk7)
bd1edc8314 MDL-55713 behat: fix mistakenly broken php 2016-10-05 01:21:32 +02:00
Eloy Lafuente (stronk7)
8497955eb4 Merge branch 'MDL-56126-master' of git://github.com/jleyva/moodle 2016-10-05 01:05:27 +02:00
Eloy Lafuente (stronk7)
b976e22a7e Merge branch 'MDL-55713-master-3' of git://github.com/andrewnicols/moodle 2016-10-05 00:34:01 +02:00
Eloy Lafuente (stronk7)
2720dce627 Merge branch 'wip-mdl-55986' of https://github.com/rajeshtaneja/moodle 2016-10-05 00:29:29 +02:00
Dan Poltawski
4089c42e12 MDL-55404 upgrade: dramatically simplify test code
Fixing http://xunitpatterns.com/Obscure%20Test.html
2016-10-04 20:00:59 +01:00
Dan Poltawski
6658ef6cd9 Merge branch 'MDL-55404-master' of git://github.com/cameron1729/moodle 2016-10-04 18:23:36 +01:00
Dan Poltawski
a57e3d3b1f MDL-56011 lib: move Mustache loading to core_component autoloader 2016-10-04 18:17:22 +01:00
Dan Poltawski
38c1cbceb7 Merge branch 'MDL-56011-master' of https://github.com/snake/moodle 2016-10-04 18:16:04 +01:00
Dan Poltawski
37705564ec Merge branch 'MDL-55100-master' of git://github.com/jleyva/moodle 2016-10-04 17:00:53 +01:00
Dan Poltawski
ed3956a39a Merge branch 'MDL-55861-master' of https://github.com/dj4452/moodle 2016-10-04 15:43:51 +01:00
Dan Poltawski
038dc234f6 MDL-55059 output: fix empty checks 2016-10-04 15:08:12 +01:00
Dan Poltawski
867b1fad2f Merge branch 'MDL-45890_m32v3' of https://github.com/sbourget/moodle 2016-10-04 13:11:37 +01:00
Dan Poltawski
a553501042 Merge branch 'wip-MDL-56001-master' of git://github.com/abgreeve/moodle 2016-10-04 12:42:25 +01:00
Juan Leyva
5c6daf139d MDL-55059 tool_mobile: Support Smart App Banners for iOs 2016-10-04 11:49:34 +01:00
Dan Poltawski
43cb92b4b0 MDL-56007 jquery: add back non-minified files
Sorry Simey, I lead you astray (detected by unit tests)
2016-10-04 11:16:29 +01:00
Dan Poltawski
a5a86826fd Merge branch 'MDL-56007-master' of git://github.com/lameze/moodle 2016-10-04 10:29:42 +01:00
Juan Leyva
3e8145a37a MDL-56126 user: New WS core_user_agree_site_policy
This commit includes a change in moodlelib to throw the
sitepolicynotagreed exception in a way that can be captured and
identified by external systems.
2016-10-04 10:20:59 +01:00
Juan Leyva
83e4dc1796 MDL-56092 core_auth: New WS core_auth_confirm_user 2016-10-04 09:50:32 +01:00
Juan Leyva
3ee392c8e8 MDL-56092 core_user: Changes in profilelib to support WS 2016-10-04 09:50:02 +01:00