Commit Graph

88234 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7) 5b123ab8d3 Merge branch 'MDL-61724-master' of git://github.com/mihailges/moodle 2018-04-03 23:38:59 +02:00
Eloy Lafuente (stronk7) 1619d36e99 Merge branch 'MDL-60115-Book-cancel-button-redirect-bug-master' of https://github.com/Moodlers/moodle-1 2018-04-03 21:45:49 +02:00
Jake Dallimore 73582bd26e Merge branch 'eugene-auth-email-wantsurl' of https://github.com/bynare/moodle-fixes 2018-04-03 18:40:52 +08:00
Jake Dallimore f16b871fe2 Merge branch 'wip-MDL-61815-master' of git://github.com/abgreeve/moodle 2018-04-03 17:53:13 +08:00
Jake Dallimore 166a9cec54 Merge branch 'wip-MDL-61127-master' of git://github.com/abgreeve/moodle 2018-04-03 17:34:03 +08:00
Jun Pataleta 5a0dd0e50d Merge branch 'MDL-58411-master' of https://github.com/lucaboesch/moodle 2018-04-03 16:44:43 +08:00
Adrian Greeve dcf4254179 MDL-61127 filepicker: Selected repository now highlighted. 2018-04-03 16:25:41 +08:00
Adrian Greeve 5aeadf0b7b MDL-61127 filepicker: Added aria-selected attribute to repos.
The repository list in the file picker now as aria-selected
added to denote which repository is selected.
2018-04-03 16:25:40 +08:00
Andrew Nicols e9b779f143 Merge branch 'wip-MDL-61629-master' of git://github.com/abgreeve/moodle 2018-04-03 15:58:26 +08:00
Adrian Greeve 7820177f20 MDL-61629 message_airnotifier: Add privacy files and unit tests. 2018-04-03 15:33:31 +08:00
Andrew Nicols c464c08a52 MDL-61256 core_search: Coding style fixes 2018-04-03 14:36:15 +08:00
Andrew Nicols a9710e9d94 Merge branch 'MDL-61256-master' of https://github.com/sammarshallou/moodle 2018-04-03 14:23:54 +08:00
Andrew Nicols c835d2c8a8 Merge branch 'MDL-61020-master' of git://github.com/rezaies/moodle 2018-04-03 13:58:03 +08:00
Luca Bösch 94cb5a662a MDL-58411 qtype_essay: Add file type validation in essay question type 2018-04-03 07:27:56 +02:00
Adrian Greeve 0f6fb93653 MDL-61815 core_privacy: Fix for metadata types and new method.
Minor fix for subsystem_link and plugintype_link.
Addition of get_null_provider_reason in the manager class.
2018-04-03 12:05:18 +08:00
Eloy Lafuente (stronk7) f6873c2e31 Merge branch 'MDL-61766-master' of git://github.com/junpataleta/moodle 2018-04-03 01:18:20 +02:00
Eloy Lafuente (stronk7) 5db00dc3c9 Merge branch 'MDL-61689-master' of git://github.com/andrewnicols/moodle 2018-04-03 01:16:27 +02:00
Eloy Lafuente (stronk7) 0f25080367 MDL-61223 course: keep some tests using old values (January 1st 1970) 2018-04-02 21:55:08 +02:00
Eloy Lafuente (stronk7) 2c28cadac1 MDL-61223 course: amend test setup to keep passing and covering case 2018-04-02 12:00:54 +02:00
Eloy Lafuente (stronk7) 7d4c1953d9 Merge branch 'MDL-61223-master' of git://github.com/andrewnicols/moodle 2018-04-02 11:53:10 +02:00
Eloy Lafuente (stronk7) 64a14f15bc Merge branch 'MDL-61801-master' of git://github.com/andrewnicols/moodle 2018-04-02 11:04:49 +02:00
Michael Brown 37fdff573b MDL-60115 mod_book: Book Resource Cancel Button Redirect Bug
When the user creates a book but adds no chapters, hitting cancel on
 the chapter creation page would redirect you right back to the same
 page with no explanation. This solution redirects to the course page
 when canceling chapter creation when no chapters are present.
2018-04-02 04:01:34 +00:00
Andrew Nicols 1690a76e62 Merge branch 'MDL-61574-master' of git://github.com/tallthom/moodle 2018-04-01 11:49:17 +08:00
Thom Rawson 6fb64a4ec0 MDL-61574 mod_lti: removed usage of PHP7 reserved word in namespace 2018-04-01 12:39:54 +09:00
sam marshall 40aa5fe9ab MDL-61256 core_search: Support search of section titles, summaries 2018-03-29 17:38:36 +01:00
Andrew Nicols 214b9e89d6 MDL-61801 core_privacy: Correct bug in unit test provider 2018-03-29 22:36:06 +08:00
Jun Pataleta a2e7a47a6e MDL-61766 xmldb: Handle custom admin path 2018-03-29 18:29:32 +08:00
Jun Pataleta 39fab18e27 weekly release 3.5dev 2018-03-29 12:55:38 +08:00
Jun Pataleta 358ac4d476 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-03-29 12:55:37 +08:00
Andrew Nicols 9cd8f95a74 Merge branch 'MDL-53226-master-fix' of git://github.com/junpataleta/moodle 2018-03-29 12:40:39 +08:00
Jun Pataleta bc178fa038 MDL-53226 search_simpledb: Fix table name in query 2018-03-29 12:38:06 +08:00
Eloy Lafuente (stronk7) 83c64f78c0 Merge branch 'MDL-36941_master-fix' of git://github.com/markn86/moodle 2018-03-28 18:42:18 +02:00
Mark Nelson 7489e4d5b9 MDL-36941 message_popup: do not remove message_popup table
This is a partial revert of commit 123631ad47.

Most of the logic was NOT reverted, just the part deleting the table was.

Note - this fix was done on integration.git and as a result no
upgrade step was added to re-introduce the table, sorry! This
means for those on integration.git you will have to re-install
your Moodle site so the 'message_popup' table is present.

Please see tracker for comments as to why we need to keep it! :)
2018-03-28 18:16:46 +02:00
Jake Dallimore 78c03392d4 Merge branch 'MDL-61770-master' of git://github.com/andrewnicols/moodle 2018-03-28 18:16:43 +02:00
Andrew Nicols e8b3c3e178 Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle 2018-03-28 18:16:40 +02:00
Andrew Nicols bddf012b7c Merge branch 'MDL-61364-master' of git://github.com/lameze/moodle 2018-03-28 18:16:37 +02:00
Ngo Nghia 5a8d683fb2 MDL-25617 backup: backup/restore using extra_question_fields 2018-03-28 18:16:34 +02:00
Eloy Lafuente (stronk7) 54b5941501 Merge branch 'MDL-39060-master' of git://github.com/zig-moodle/moodle 2018-03-28 18:16:31 +02:00
Eloy Lafuente (stronk7) 55bfb8ab5f Merge branch 'wip-MDL-51362-master' of git://github.com/marinaglancy/moodle 2018-03-28 18:16:28 +02:00
Eloy Lafuente (stronk7) c7189fb2bb MDL-60736 tool_mobile: Add missing VALUE_OPTIONAL to new returned info 2018-03-28 18:16:25 +02:00
Eloy Lafuente (stronk7) 6aaf27af91 Merge branch 'MDL-60736-master' of git://github.com/jleyva/moodle 2018-03-28 18:16:22 +02:00
Eloy Lafuente (stronk7) 67eb557286 Merge branch 'MDL-61321-master' of git://github.com/jleyva/moodle 2018-03-28 18:16:19 +02:00
Eloy Lafuente (stronk7) 4b96d7ce05 Merge branch 'MDL-61718-master' of git://github.com/junpataleta/moodle 2018-03-28 18:16:15 +02:00
Jun Pataleta 51c6cfb69a Merge branch 'MDL-60762-master' of git://github.com/junpataleta/moodle 2018-03-28 18:16:12 +02:00
Jun Pataleta 99feb82ab5 Merge branch 'wip-MDL-61328-master' of git://github.com/marinaglancy/moodle 2018-03-28 18:16:09 +02:00
Jun Pataleta 4683e5ff11 Merge branch 'MDL-61257-master' of git://github.com/mihailges/moodle 2018-03-28 18:16:06 +02:00
Jun Pataleta d6ccd91832 Merge branch 'MDL-61656' of git://github.com/stronk7/moodle 2018-03-28 18:16:03 +02:00
Eloy Lafuente (stronk7) bdb22af959 Merge branch 'MDL-53226-master' of git://github.com/andrewnicols/moodle 2018-03-28 18:15:52 +02:00
Eloy Lafuente (stronk7) c3f771aeba Merge branch 'MDL-61248' of https://github.com/ak4t0sh/moodle 2018-03-28 18:12:52 +02:00
Eloy Lafuente (stronk7) a8336b03a0 Merge branch 'MDL-61576-master' of git://github.com/cescobedo/moodle 2018-03-28 18:12:48 +02:00