97288 Commits

Author SHA1 Message Date
Adrian Greeve
4f7b9e3276 Merge branch 'MDL-68330-master-2' of git://github.com/mihailges/moodle 2020-05-04 07:15:03 +08:00
Andrew Nicols
2d1944fe60 Merge branch 'MDL-66263' of https://github.com/stronk7/moodle 2020-05-03 20:21:17 +08:00
Andrew Nicols
e2ad2506df Merge branch 'MDL-68589' of https://github.com/stronk7/moodle 2020-05-03 20:13:54 +08:00
Andrew Nicols
53c06b63c5 Merge branch 'MDL-68473-master' of git://github.com/vmdef/moodle 2020-05-03 19:59:46 +08:00
Eloy Lafuente (stronk7)
2f24562d07 MDL-68589 plist: Add information about local changes 2020-05-03 01:28:41 +02:00
Eloy Lafuente (stronk7)
bf527c8bf9 MDL-68589 plist: PHP 7.4 curly bracket fixes
Note this is, partially, https://github.com/TECLIB/CFPropertyList/pull/61

I only have applied the stricly required PHP 7.4 changes, keeping
apart the intval() ==> (int) change, because that's unrelated to
this fix.
2020-05-03 01:05:10 +02:00
Eloy Lafuente (stronk7)
31bb99549e MDL-66263 travis: Simple bump to php74
Also update a couple of places (mysql, node)
that were not runnig really on highest. Now they are.
2020-05-02 17:19:15 +02:00
Eloy Lafuente (stronk7)
cd391f9922 on-demand release 3.9dev+ 2020-05-02 16:37:31 +02:00
Eloy Lafuente (stronk7)
89696acccf Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2020-05-02 16:37:29 +02:00
Eloy Lafuente (stronk7)
1097530242 Merge branch 'MDL-68328-dlfix' of https://github.com/cengage/moodle 2020-05-01 23:33:08 +02:00
Claude Vervoort
779e753faf MDL-68328 mod_lti: resourcekey and pwd hidden not removed 2020-05-01 15:03:14 -04:00
Eloy Lafuente (stronk7)
157f5c9e54 Merge branch 'MDL-66135' of https://github.com/paulholden/moodle 2020-05-01 16:07:56 +02:00
Víctor Déniz Falcón
a8455b7240 MDL-68473 core_h5p: moved fixture to anonymous class 2020-05-01 14:25:11 +01:00
Victor Deniz Falcon
e4127c9262 MDL-68473 core_h5p: fixed import of moodleform class 2020-05-01 13:59:16 +01:00
Paul Holden
e1dfd4b83c MDL-66135 tool_uploadcourse: case-insensitive date string comparison.
Account for PM/pm differences in PHP on different OS.
2020-05-01 09:05:07 +01:00
Jun Pataleta
c9a5ccccf0 Merge branch 'MDL-67798-master-fix' of git://github.com/andrewnicols/moodle 2020-05-01 15:44:26 +08:00
Andrew Nicols
9e0c40d1bd MDL-67798 contentbank: Sort data before comparison 2020-05-01 15:42:01 +08:00
Andrew Nicols
3076dfe55d Merge branch 'MDL-68492-master' of https://github.com/sammarshallou/moodle 2020-05-01 12:07:00 +08:00
Andrew Nicols
ce8cc79712 MDL-67798 contentbank: Whitespace fixes 2020-05-01 11:51:15 +08:00
Andrew Nicols
468817abcd Merge branch 'MDL-67798-master' of git://github.com/cescobedo/moodle 2020-05-01 11:43:20 +08:00
Andrew Nicols
aa3813b72b Merge branch 'master_MDL-67540' of https://github.com/golenkovm/moodle 2020-05-01 11:20:55 +08:00
Jun Pataleta
cfcbebaacb Merge branch 'MDL-68506-master' of git://github.com/andrewnicols/moodle 2020-05-01 11:20:21 +08:00
Andrew Nicols
8d186121ab Merge branch 'MDL-57680' of https://github.com/timhunt/moodle 2020-05-01 11:00:19 +08:00
Dmitrii Metelkin
327da79b27 MDL-67850 quizaccess: change SEB supported versions 2020-05-01 10:59:36 +08:00
Dmitrii Metelkin
baed1968b5 MDL-67850 quizaccess: fix broken unit tests 2020-05-01 10:59:08 +08:00
Dmitrii Metelkin
4b6c4f6713 MDL-67850 quizaccess: remove invalid white spaces 2020-05-01 10:58:30 +08:00
Dmitrii Metelkin
4aaf342df7 MDL-67850 lib: remove trailing slash for plist 2020-05-01 10:58:18 +08:00
Andrew Nicols
5a477de341 Merge branch 'MDL-43156' of https://github.com/stronk7/moodle 2020-05-01 10:16:37 +08:00
Eloy Lafuente (stronk7)
fcad901c73 Merge branch 'MDL-66135' of https://github.com/paulholden/moodle 2020-05-01 01:51:49 +02:00
Bas Brands
555ec89ad3 MDL-68329 cache: Improve cache performance footer info 2020-05-01 01:13:37 +02:00
Paul Holden
d62fc08ed9 MDL-66135 tool_uploadcourse: support custom course fields. 2020-05-01 00:10:15 +01:00
Eloy Lafuente (stronk7)
fd0344e388 Merge branch 'MDL-68328-dlfix' of https://github.com/cengage/moodle 2020-05-01 00:32:00 +02:00
Eloy Lafuente (stronk7)
9b0a1e2a98 Merge branch 'MDL-68427-master' of git://github.com/andrewnicols/moodle 2020-04-30 23:35:09 +02:00
Davo Smith
9da975fe21 MDL-43156 core_form: fix handling of fixture form
Also moving it from behat_forms to behat_navigation
2020-04-30 20:39:24 +02:00
Davo Smith
5079271b39 MDL-43156 formslib: newly-created repeat elements get the default values 2020-04-30 20:16:07 +02:00
JayChurchward
869f44063e MDL-68542 editor-atto: Change the bold tag to <strong>. 2020-04-30 11:29:22 -04:00
Jun Pataleta
9be6c16a37 Merge branch 'MDL-66732' of https://github.com/paulholden/moodle 2020-04-30 17:16:16 +08:00
Andrew Nicols
e217c0f326 Merge branch 'MDL-67075-redis-session-locks' of https://github.com/brendanheywood/moodle 2020-04-30 16:05:05 +08:00
Jun Pataleta
2a858c2d5e Merge branch 'MDL-68404-master' of git://github.com/lucaboesch/moodle 2020-04-30 13:33:45 +08:00
Brendan Heywood
7bc8ccdcf0 MDL-67075 session: Added extra debugging of blocking redis session locks 2020-04-30 13:06:07 +10:00
Jun Pataleta
728b03c049 Merge branch 'MDL-68309-master' of https://github.com/snake/moodle 2020-04-30 09:57:50 +08:00
Jake Dallimore
192a43f109 Merge branch 'MDL-67850-seb-integration-3' of https://github.com/catalyst/moodle 2020-04-30 09:13:14 +08:00
AMOS bot
573704d577 Automatically generated installer lang files 2020-04-30 00:11:50 +00:00
Eloy Lafuente (stronk7)
9b2b1f3fa5 Merge branch 'MDL-68434-master-enfix' of git://github.com/mudrd8mz/moodle 2020-04-29 22:52:40 +02:00
David Mudrák
8599eb5ebb MDL-68434 lang: Use the updated terminology in the tests 2020-04-29 17:40:58 +02:00
Neosi
d772cce77a MDL-68551 editor-atto: change <strike> to <del> 2020-04-29 16:00:12 +01:00
Adrian Greeve
b8cf95bb48 Merge branch 'MDL-68442-master' of git://github.com/andrewnicols/moodle 2020-04-29 13:54:57 +08:00
Dmitrii Metelkin
78adf6f63a MDL-67850 quizaccess: remove the old quizaccess_safebrowser
Co-authored-by: Nicholas Hoobin <nicholashoobin@catalyst-au.net>
Co-authored-by: Andrew Madden <andrewmadden@catalyst-au.net>
2020-04-29 14:29:21 +10:00
Andrew Madden
79f621241c MDL-67850 quizaccess: add Safe Exam Browser access rule plugin
Co-authored-by: Nicholas Hoobin <nicholashoobin@catalyst-au.net>
Co-authored-by: Dmitrii Metelkin <dmitriim@catalyst-au.net>
2020-04-29 14:28:54 +10:00
Andrew Madden
3df8492132 MDL-67850 lib: add new plist library
Co-authored-by: Nicholas Hoobin <nicholashoobin@catalyst-au.net>
Co-authored-by: Dmitrii Metelkin <dmitriim@catalyst-au.net>
2020-04-29 14:10:22 +10:00