Commit Graph

89847 Commits

Author SHA1 Message Date
Cameron Ball 32778e73de MDL-57321 theme_boost: Fix improperly nested ul elements in footer 2017-03-01 11:35:50 +08:00
Cameron Ball c77cdbd704 MDL-57321 theme_boost: Use div instead of span for dropdown items 2017-03-01 11:35:49 +08:00
Cameron Ball f6d94dc01f MDL-57321 theme_boost: Consistently apply attributes on elements 2017-03-01 11:35:44 +08:00
Andrew Nicols 7b0a41447a Merge branch 'MDL-58072_master_tabtree_mustache' of https://github.com/mchurchward/moodle 2017-03-01 11:09:38 +08:00
Eloy Lafuente (stronk7) b0253c3323 Merge branch 'wip-MDL-48228-master-v2' of git://github.com/abgreeve/moodle 2017-03-01 02:56:56 +01:00
Eloy Lafuente (stronk7) b239dfd9aa Merge branch 'MDL-53978-master-fix' of https://github.com/andrewnicols/moodle 2017-03-01 02:46:06 +01:00
Andrew Nicols e890de5531 Merge branch 'm33_MDL-57789_Add_Cache_Control_Immutable_Support' of https://github.com/scara/moodle 2017-03-01 09:31:45 +08:00
Andrew Nicols 5d86494808 MDL-53978 core: Improve cache usage when no callbacks are defined 2017-03-01 09:18:13 +08:00
Adrian Greeve 8c1288dbdb MDL-48228 database: Unit test addition and update. 2017-03-01 09:03:12 +08:00
Adrian Greeve 0bbefd81cd MDL-48228 database: Make utf8mb4 the default character set for mysql.
Thanks to Jetha Chan for providing the initial patch that this is
based on.
2017-03-01 09:03:12 +08:00
Eloy Lafuente (stronk7) dd6b41a5c7 Merge branch 'MDL-58071-master' of git://github.com/jleyva/moodle 2017-02-28 22:57:09 +01:00
Eloy Lafuente (stronk7) 211843420d Merge branch 'MDL-55980-master' of https://github.com/sammarshallou/moodle 2017-02-28 22:11:16 +01:00
Eloy Lafuente (stronk7) 1e8af13516 Merge branch 'MDL-55762-master' of git://github.com/ankitagarwal/moodle 2017-02-28 20:38:56 +01:00
Stephen Bourget c3feaf269e MDL-51853 calendar: allow entries imported from a file to be updated. 2017-02-28 10:14:25 -05:00
Zoe Bogner 004738e03d MDL-57999 grades: Add itemname to gradereport_user_get_grade_items 2017-02-28 21:29:59 +10:30
David Monllao f3221d8d79 Merge branch 'wip-MDL-51833-master' of git://github.com/abgreeve/moodle 2017-02-28 11:29:33 +01:00
Rajesh Taneja db4b59fa03 MDL-58068 testing: Whitelist alternative_file_system_class in testing
Unit test and behat should be allowed to
run with alternative file system
2017-02-28 14:58:49 +08:00
Ankit Agarwal ca09e2157b MDL-57362 assignlib: Fix minor bug in phpdocs 2017-02-28 10:34:03 +05:30
Ankit Agarwal f445fb8fa1 MDL-57362 assignlib: Check for sep groups edge case 2017-02-28 10:34:02 +05:30
Andrew Nicols b6cab2b505 Merge branch 'MDL-58038-master-3' of https://github.com/snake/moodle 2017-02-28 12:19:33 +08:00
Jake Dallimore 9e44cec27f MDL-58038 email: make sure all allowedemaildomain entries are respected
Fixes a bug with exploding the config var, in which trailing carriage
returns were causing string matches to fail.
2017-02-28 12:17:52 +08:00
Rajesh Taneja da52592a7b MDL-58091 behat: Added missing @_file_upload tag 2017-02-28 11:21:13 +08:00
Andrew Nicols 3c395fe486 Merge branch 'master' of git.in.moodle.com:moodle/integration; branch 'MDL-35980-master' of git://github.com/snake/moodle 2017-02-28 10:33:40 +08:00
Jake Dallimore 2671500dee MDL-35980 behat: fix link text in submission_comments feature 2017-02-28 10:23:21 +08:00
Andrew Nicols d83be33f3d MDL-55547 tool_monitor: Coding style fixes 2017-02-28 09:43:21 +08:00
Andrew Nicols d28357fbca Merge branch 'wip-MDL-55547-master' of git://github.com/marinaglancy/moodle 2017-02-28 09:43:14 +08:00
Eloy Lafuente (stronk7) 7002b7c320 Merge branch 'MDL-58041_master' of https://github.com/sam-moodle/moodle 2017-02-28 02:29:17 +01:00
Eloy Lafuente (stronk7) b4472fb459 Merge branch 'MDL-57524_master' of https://github.com/nadavkav/moodle 2017-02-28 02:24:08 +01:00
Eloy Lafuente (stronk7) 06fb1df811 Merge branch 'MDL-58030' of git://github.com/aolley/moodle 2017-02-27 22:47:14 +01:00
Helen Foster ecfe6f58ce MDL-58064 lang: Merge English strings from the en_fix language pack 2017-02-27 10:14:34 +01:00
Rajesh Taneja 26bf6d4ead MDL-57940 behat: Allow behat parallel run to start with delay
Behat parallel run if executed together
then selenium might fail to launch browser
and timeout. It would be nice to have a
custom delay between the start of each process
2017-02-27 16:15:31 +08:00
Andrew Nicols d21b71fb1a MDL-53978 usertours: Coding style fix 2017-02-27 15:21:36 +08:00
Andrew Nicols d9a5f82086 Merge branch 'MDL-53978-render-callbacks' of https://github.com/brendanheywood/moodle 2017-02-27 15:20:28 +08:00
Andrew Nicols 71cc1e529d Merge branch 'MDL-50719-fast-locks' of https://github.com/brendanheywood/moodle 2017-02-27 13:42:55 +08:00
Andrew Nicols 696099b94f Merge branch 'MDL-35980-master' of git://github.com/snake/moodle 2017-02-27 11:58:23 +08:00
Ankit Agarwal 1f3556b010 MDL-55762 assignpdf: Handle errored pages better 2017-02-27 09:24:07 +05:30
Ankit Agarwal b6d06a5f78 MDL-55762 assignpdf: Fix bug in phpdocs 2017-02-27 09:24:07 +05:30
Andrew Nicols 50d567767c Merge branch 'MDL-58032-master' of git://github.com/ankitagarwal/moodle 2017-02-27 11:45:30 +08:00
Andrew Nicols b117fb3db9 MDL-33483 repository: Coding style tidyup 2017-02-27 11:31:00 +08:00
Andrew Nicols eccbea3dd0 Merge branch 'MDL-33483_m33v2' of https://github.com/sbourget/moodle 2017-02-27 10:40:21 +08:00
Ryan Wyllie 0531ce1a29 MDL-57280 javascript: add modal registry
Add a modal registry for the types and make the factory use it to allow
code to register modal types at run time and use the factory for
non-core modals.
2017-02-27 01:05:44 +00:00
Adrian Greeve 7c8afa8ff8 MDL-51833 tool_monitor: Improve access check for monitor. 2017-02-27 08:59:45 +08:00
Matteo Scaramuccia 203c5bce27 MDL-57789 files: Reviewed lifetime value 2017-02-25 23:42:37 +01:00
Matteo Scaramuccia ed0a1cd708 MDL-57789 files: Use immutable Cache-Control extension. 2017-02-25 23:42:35 +01:00
Matteo Scaramuccia f2de8226a8 MDL-57789 files: Used if-then instead of ternary operators 2017-02-25 23:36:07 +01:00
Matteo Scaramuccia 7338ce0182 MDL-57789 files: Let send_stored_file() rely on send_file(). 2017-02-25 23:36:04 +01:00
Nadav Kavalerchik f9c1a7515a MDL-57524 theme_boost: Fix ignored input size on admin pages 2017-02-24 21:52:41 +02:00
Juan Leyva eeae783ca3 MDL-58071 user: Return usernotfullysetup exception in WS
If there is an empty required custom user profile field, Web Services
should return the usernotfullysetup exception instead ignoring it.
The mobile app already handles this exception for core fields
redirecting the user to web in order to fill the missing field.
2017-02-24 20:11:27 +01:00
Mike Churchward 85d9ed8b3b MDL-58072 theme_boost: Added quotes to title; removed extra spaces. 2017-02-24 11:15:30 -05:00
sam marshall 38fa1ca558 MDL-55980 Scheduled tasks: Run individual scheduled tasks from web 2017-02-24 10:42:28 +00:00