Commit graph

80696 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
69e18dbf70 Merge branch 'wip-MDL-55832-master' of git://github.com/marinaglancy/moodle 2016-09-06 15:56:01 +02:00
Dan Poltawski
2e79c7305d MDL-42125 quiz stats: removal trivial additional phpdocs newline 2016-09-06 11:47:57 +01:00
Dan Poltawski
7c5b0bbcbe Merge branch 'MDL-42125' of git://github.com/timhunt/moodle 2016-09-06 11:46:52 +01:00
Dan Poltawski
aed3367f1e MDL-55415 course: fix trailing whitespace 2016-09-06 10:50:49 +01:00
Dan Poltawski
05842d741b Merge branch 'MDL-55415-master' of git://github.com/jleyva/moodle 2016-09-06 10:49:39 +01:00
Dan Poltawski
f0ca10fb1b Merge branch 'wip-mdl-55749' of https://github.com/rajeshtaneja/moodle 2016-09-06 08:43:52 +01:00
Marina Glancy
308ce5b46f MDL-55827 tests: @ does not suppress wrong number of arguments in php7.1 2016-09-06 15:37:30 +08:00
Cameron Ball
ab3759fff5
MDL-55404 core_upgrade: Add libcurl environment checks
This patch adds logic to test whether or not the
libcurl (used by PHP/cURL)  was compiled against a compatible
SSL/TLS library.
2016-09-06 11:34:46 +08:00
David Monllao
500af4968b Merge branch 'MDL-55504' of https://github.com/mr-russ/moodle 2016-09-06 11:30:13 +08:00
Russell Smith
8f7dcb3453 MDL-55504 profiling: Support for PHPUnit and big profiles.
To support PHPUnit we need to support large profiles, these may
include backups and restores. To do that the following was required;
- gzcompress for database space saving.
- gzcompress for XML DomDocument field to say < 10Mb and allow imports.
- Save PHPUnit runs directly to a file so they can be imported to the normal database.
- Memory allowance on profiling view pages increases to support large profiles.
2016-09-06 12:41:56 +10:00
Rajesh Taneja
3b73ba8fa4
MDL-55749 badges: define global before using it 2016-09-06 10:27:44 +08:00
David Monllao
9f3ba5c425 Merge branch 'MDL-55617' of https://github.com/NeillM/moodle 2016-09-06 10:17:49 +08:00
David Monllao
6f42301b2e Merge branch 'wip-mdl-55288' of https://github.com/rajeshtaneja/moodle 2016-09-06 10:15:31 +08:00
David Monllao
370fe0634d Merge branch 'MDL-55587-master' of git://github.com/cameron1729/moodle 2016-09-06 10:07:00 +08:00
Eloy Lafuente (stronk7)
e1683ea5a3 Merge branch 'MDL-55239_m32v1' of https://github.com/sbourget/moodle 2016-09-05 19:23:13 +02:00
Eloy Lafuente (stronk7)
f30c075d69 Merge branch 'MDL-55663-master' of git://github.com/FMCorz/moodle 2016-09-05 18:06:40 +02:00
Eloy Lafuente (stronk7)
a1a564c84a Merge branch 'MDL-55717_master' of git://github.com/markn86/moodle 2016-09-05 18:01:21 +02:00
Eloy Lafuente (stronk7)
5e16bdb25c Merge branch 'MDL-55724-master' of https://github.com/sammarshallou/moodle 2016-09-05 17:33:25 +02:00
Juan Leyva
b9050b106e MDL-55415 course: New WS core_course_get_user_administration_options 2016-09-05 15:42:48 +01:00
Juan Leyva
b2392037e7 MDL-55415 course: Move admin options permission check to API 2016-09-05 15:42:47 +01:00
Juan Leyva
c115ff6ab5 MDL-55415 course: New WS core_course_get_user_navigation_options 2016-09-05 15:42:47 +01:00
Juan Leyva
e200200938 MDL-55415 webservice: Allow validate_courses to return contexts 2016-09-05 15:42:45 +01:00
Juan Leyva
d6cd89b110 MDL-55415 course: Move options permission check to API 2016-09-05 15:42:45 +01:00
Dan Poltawski
9423674717 Merge branch 'MDL-55627' of https://github.com/bostelm/moodle 2016-09-05 14:09:09 +01:00
Dan Poltawski
dca4a87101 Merge branch 'MDL-55742-master' of https://github.com/xow/moodle 2016-09-05 10:50:47 +01:00
Henning Bostelmann
f617ac5c75 MDL-55627 filter_mathjaxloader: use correct string concatenation op 2016-09-05 11:40:04 +02:00
Henning Bostelmann
e5e89cacfb MDL-55236 mod_assign: Allow subplugins to backup files 2016-09-05 11:39:12 +02:00
Dan Poltawski
9dd516c432 Merge branch 'MDL-55771_master' of git://github.com/markn86/moodle 2016-09-05 10:18:53 +01:00
Dan Poltawski
a46f187431 Merge branch 'wip-mdl-55766' of https://github.com/rajeshtaneja/moodle 2016-09-05 09:24:27 +01:00
Dan Poltawski
eccebeebf5 Merge branch 'MDL-55815' of git://github.com/timhunt/moodle 2016-09-05 08:27:58 +01:00
Dan Poltawski
e7b4f3d3ae Merge branch 'wip-MDL-55826-master' of git://github.com/marinaglancy/moodle 2016-09-05 08:18:32 +01:00
Dan Poltawski
e5c5f5d3ff Merge branch 'MDL-54113-master' of git://github.com/andrewnicols/moodle 2016-09-05 07:53:26 +01:00
Rajesh Taneja
9b9afffe5b
MDL-55288 forms: Set data attribute to form fields 2016-09-05 14:10:24 +08:00
David Monllao
94c9d470d1 Merge branch 'wip-MDL-41174-master' of git://github.com/abgreeve/moodle 2016-09-05 13:44:36 +08:00
Marina Glancy
f9e2d3d451 MDL-55832 mod_feedback: apply filters to multichoice quesitons 2016-09-05 13:29:57 +08:00
Andrew Nicols
63d7b1acc0 MDL-42041 mod_book: Add Turn Editing On to page body 2016-09-05 13:08:24 +08:00
Marina Glancy
c6745991b1 MDL-55844 profile: display formatted course name 2016-09-05 13:05:56 +08:00
David Monllao
2ab5bbc409 Merge branch 'MDL-55457-master' of https://github.com/xow/moodle 2016-09-05 11:48:34 +08:00
David Monllao
af12b3c663 Merge branch 'wip_MDL-53724_master' of git://github.com/gjb2048/moodle 2016-09-05 11:34:06 +08:00
David Monllao
f1ef913364 Merge branch 'wip-MDL-55707-master' of git://github.com/abgreeve/moodle 2016-09-05 10:46:57 +08:00
Rajesh Taneja
54ced30d03
MDL-55610 behat: Clear static file cache
php file cache might be out-of-sync
to ensure full directory is deleted
clear php file cache
2016-09-05 10:18:19 +08:00
Adrian Greeve
9851111f7a MDL-41174 course: Module name change updates calendar. 2016-09-02 11:46:09 +08:00
Marina Glancy
d47af580bd MDL-55826 question: fix PHP7.1 strict warnings 2016-09-02 10:52:02 +08:00
John Okely
d51757a729 MDL-55457 mod_lti: Support object icon_info in tool proxy 2016-09-02 09:39:31 +08:00
Gareth J Barnard
efe67d05b2 MDL-53724 themes: Inconsistent padding when >= one blocks are docked. 2016-09-01 18:22:28 +01:00
Tim Hunt
6ae04c2684 MDL-42125 quiz stats: fix regression caused by MDL-51603 2016-09-01 12:38:30 +01:00
Tim Hunt
9e5e0d8de4 MDL-42125 quiz stats: clearer message when manual grading required 2016-09-01 12:34:40 +01:00
Neill Magill
31c62848f0 MDL-55617 backup: Possible fatal errors in backup and restore
The unserialize() function will not always return an object
especially when as can happen the controller field of a
record in the backup_controllers table is empty.

This change ensures that in this case the script will
not cause a fatal error, but instead throw an error.
2016-09-01 08:51:25 +01:00
Neill Magill
fefd9fed83 MDL-55618 backup: Header should not be output twice
Before this patch if the pre-check failed during
the final stage of an import a request for the
page header to be output was made for a second
time, this caused a coding_error to occur.

This change removes the second request to
output the page header, which will allow the user
to see the reasons the pre-check failed.
2016-09-01 08:43:45 +01:00
Cameron Ball
b8d0f90ec7
MDL-54793 webservice_xmlrpc: Don't treat GET and POST as arguments 2016-09-01 15:15:10 +08:00