moodle.git
4 years agoMerge branch 'MDL-55906-grading-table-filters-not-reset-master' of https://github...
Dan Poltawski [Mon, 12 Dec 2016 09:06:38 +0000 (09:06 +0000)]
Merge branch 'MDL-55906-grading-table-filters-not-reset-master' of https://github.com/ilya-catalyst/moodle

4 years agoMerge branch 'MDL-46714-master-nadav' of git://github.com/FMCorz/moodle
Andrew Nicols [Mon, 12 Dec 2016 04:51:19 +0000 (12:51 +0800)]
Merge branch 'MDL-46714-master-nadav' of git://github.com/FMCorz/moodle

4 years agoMDL-46714 Calendar: Properly order Date & Time fields in RTL mode
Nadav Kavalerchik [Sat, 5 Nov 2016 21:37:50 +0000 (23:37 +0200)]
MDL-46714 Calendar: Properly order Date & Time fields in RTL mode

4 years agoweekly on-sync release 3.3dev
Dan Poltawski [Thu, 8 Dec 2016 08:43:19 +0000 (08:43 +0000)]
weekly on-sync release 3.3dev

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 8 Dec 2016 08:43:18 +0000 (08:43 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMerge branch 'wip-MDL-56614-fix2' of https://github.com/marinaglancy/moodle
Andrew Nicols [Thu, 8 Dec 2016 05:50:34 +0000 (13:50 +0800)]
Merge branch 'wip-MDL-56614-fix2' of https://github.com/marinaglancy/moodle

4 years agoMDL-55906 table: Update user preferences table when reset preferences
Ilya Tregubov [Tue, 6 Dec 2016 03:35:00 +0000 (14:35 +1100)]
MDL-55906 table: Update user preferences table when reset preferences

4 years agoMDL-56614 behat: add missing wait for page is ready
Marina Glancy [Thu, 8 Dec 2016 02:34:04 +0000 (10:34 +0800)]
MDL-56614 behat: add missing wait for page is ready

4 years agoMerge branch 'MDL-57278-master-5' of https://github.com/xow/moodle
Andrew Nicols [Thu, 8 Dec 2016 02:44:49 +0000 (10:44 +0800)]
Merge branch 'MDL-57278-master-5' of https://github.com/xow/moodle

4 years agoMDL-57278 signup: Fix double encoding of confirmation links
John Okely [Wed, 7 Dec 2016 03:16:25 +0000 (11:16 +0800)]
MDL-57278 signup: Fix double encoding of confirmation links

4 years agoMDL-57278 signup: Unit tests covering confirmation link generation
John Okely [Wed, 7 Dec 2016 03:43:54 +0000 (11:43 +0800)]
MDL-57278 signup: Unit tests covering confirmation link generation

4 years agoMerge branch 'wip-mdl-56642' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 7 Dec 2016 23:36:25 +0000 (00:36 +0100)]
Merge branch 'wip-mdl-56642' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-56642 dataformat: Fixed method_exits parameters
Rajesh Taneja [Wed, 7 Dec 2016 23:20:21 +0000 (07:20 +0800)]
MDL-56642 dataformat: Fixed method_exits parameters

4 years agoAutomatically generated installer lang files
AMOS bot [Wed, 7 Dec 2016 16:04:57 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-57283_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 7 Dec 2016 10:16:54 +0000 (10:16 +0000)]
Merge branch 'MDL-57283_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle
Dan Poltawski [Wed, 7 Dec 2016 08:45:16 +0000 (08:45 +0000)]
Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle

4 years agoMerge branch 'wip-MDL-56614-fix' of https://github.com/marinaglancy/moodle
Andrew Nicols [Wed, 7 Dec 2016 06:56:49 +0000 (14:56 +0800)]
Merge branch 'wip-MDL-56614-fix' of https://github.com/marinaglancy/moodle

4 years agoMDL-56614 behat: corrections to new steps
Marina Glancy [Wed, 7 Dec 2016 05:37:49 +0000 (13:37 +0800)]
MDL-56614 behat: corrections to new steps

4 years agoMerge branch 'wip-mdl-56353' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 7 Dec 2016 03:53:34 +0000 (11:53 +0800)]
Merge branch 'wip-mdl-56353' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-56353 behat: Added test for multi select dependency
Rajesh Taneja [Tue, 11 Oct 2016 05:57:10 +0000 (13:57 +0800)]
MDL-56353 behat: Added test for multi select dependency

4 years agoMerge branch 'wip-MDL-56642-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Wed, 7 Dec 2016 02:00:30 +0000 (10:00 +0800)]
Merge branch 'wip-MDL-56642-master' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-57266' of git://github.com/stronk7/moodle
Andrew Nicols [Wed, 7 Dec 2016 01:53:16 +0000 (09:53 +0800)]
Merge branch 'MDL-57266' of git://github.com/stronk7/moodle

4 years agoMerge branch 'MDL-56240' of git://github.com/stronk7/moodle
Andrew Nicols [Wed, 7 Dec 2016 01:50:16 +0000 (09:50 +0800)]
Merge branch 'MDL-56240' of git://github.com/stronk7/moodle

4 years agoMerge branch 'wip-mdl-56614' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 7 Dec 2016 01:42:20 +0000 (09:42 +0800)]
Merge branch 'wip-mdl-56614' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-56642 dataformat: set temp dir
Marina Glancy [Mon, 31 Oct 2016 01:17:43 +0000 (09:17 +0800)]
MDL-56642 dataformat: set temp dir

Thanks to Chien Wen-Chang for proposing a patch

4 years agoMerge branch 'wip-mdl-57137' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 7 Dec 2016 01:00:22 +0000 (09:00 +0800)]
Merge branch 'wip-mdl-57137' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-57137 behat: Subcategory has black space before name
Rajesh Taneja [Tue, 6 Dec 2016 23:01:12 +0000 (07:01 +0800)]
MDL-57137 behat: Subcategory has black space before name

4 years agoMDL-56614 behat: Fixed steps to use new definition
Rajesh Taneja [Tue, 6 Dec 2016 23:10:35 +0000 (07:10 +0800)]
MDL-56614 behat: Fixed steps to use new definition

4 years agoAutomatically generated installer lang files
AMOS bot [Tue, 6 Dec 2016 16:04:51 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-45873' of https://github.com/bostelm/moodle
Dan Poltawski [Tue, 6 Dec 2016 15:56:23 +0000 (15:56 +0000)]
Merge branch 'MDL-45873' of https://github.com/bostelm/moodle

4 years agoMerge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 6 Dec 2016 15:50:36 +0000 (15:50 +0000)]
Merge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle

4 years agoMerge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 6 Dec 2016 12:48:09 +0000 (12:48 +0000)]
Merge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle

4 years agoMerge branch 'MDL-56836-master' of https://github.com/snake/moodle
Dan Poltawski [Tue, 6 Dec 2016 12:46:19 +0000 (12:46 +0000)]
Merge branch 'MDL-56836-master' of https://github.com/snake/moodle

4 years agoMerge branch 'MDL-56233-32-mocksubmit' of https://github.com/roperto/moodle
Dan Poltawski [Tue, 6 Dec 2016 12:42:00 +0000 (12:42 +0000)]
Merge branch 'MDL-56233-32-mocksubmit' of https://github.com/roperto/moodle

4 years agoMDL-56778 enrol: add note about legacy css
Dan Poltawski [Tue, 6 Dec 2016 12:31:57 +0000 (12:31 +0000)]
MDL-56778 enrol: add note about legacy css

4 years agoMerge branch 'MDL-56778_master' of https://github.com/nadavkav/moodle
Dan Poltawski [Tue, 6 Dec 2016 12:30:28 +0000 (12:30 +0000)]
Merge branch 'MDL-56778_master' of https://github.com/nadavkav/moodle

4 years agoMerge branch 'MDL-57199' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 6 Dec 2016 12:25:36 +0000 (12:25 +0000)]
Merge branch 'MDL-57199' of git://github.com/timhunt/moodle

4 years agoMerge branch 'MDL-56971-m' of https://github.com/micaherne/moodle
Dan Poltawski [Tue, 6 Dec 2016 11:08:08 +0000 (11:08 +0000)]
Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle

4 years agoMDL-53677 tool_spamcleaner: CSRF Fix
SSRF [Wed, 5 Oct 2016 16:14:09 +0000 (17:14 +0100)]
MDL-53677 tool_spamcleaner: CSRF Fix

Resolves minor CSRF within Moodle spamcleaner.

4 years agoMerge branch 'MDL-57137_question_category_with_parent_category' of https://github...
Andrew Nicols [Tue, 6 Dec 2016 06:52:32 +0000 (14:52 +0800)]
Merge branch 'MDL-57137_question_category_with_parent_category' of https://github.com/melihovv/moodle

4 years agoMerge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle
Andrew Nicols [Tue, 6 Dec 2016 06:34:06 +0000 (14:34 +0800)]
Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle

4 years agoMDL-57284 boost: Fix booktool_print icons
Ankit Agarwal [Tue, 6 Dec 2016 06:21:02 +0000 (11:51 +0530)]
MDL-57284 boost: Fix booktool_print icons

4 years agoMDL-57283 core: fixed function call on null
Mark Nelson [Tue, 6 Dec 2016 06:10:06 +0000 (14:10 +0800)]
MDL-57283 core: fixed function call on null

4 years agoMerge branch 'MDL-56301-master' of https://github.com/snake/moodle
Andrew Nicols [Tue, 6 Dec 2016 06:10:40 +0000 (14:10 +0800)]
Merge branch 'MDL-56301-master' of https://github.com/snake/moodle

4 years agoMerge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 6 Dec 2016 05:37:33 +0000 (13:37 +0800)]
Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-57161-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 6 Dec 2016 05:06:39 +0000 (13:06 +0800)]
Merge branch 'MDL-57161-master' of git://github.com/lameze/moodle

4 years agoMDL-56614 behat: add navigation block when required
Marina Glancy [Tue, 6 Dec 2016 03:41:55 +0000 (11:41 +0800)]
MDL-56614 behat: add navigation block when required

Most of these hacks have links to corresponding MDL issues

4 years agoMDL-56614 behat: rename step for navigating in the gradebook
Marina Glancy [Tue, 6 Dec 2016 03:30:51 +0000 (11:30 +0800)]
MDL-56614 behat: rename step for navigating in the gradebook

4 years agoMDL-56614 behat: navigate without navigation and admin blocks
Marina Glancy [Mon, 5 Dec 2016 04:23:53 +0000 (12:23 +0800)]
MDL-56614 behat: navigate without navigation and admin blocks

4 years agoMDL-56614 block_navigation: Add block in behat tests
Marina Glancy [Mon, 5 Dec 2016 03:53:28 +0000 (11:53 +0800)]
MDL-56614 block_navigation: Add block in behat tests

4 years agoMDL-56614 behat: new steps for navigation without blocks
Marina Glancy [Mon, 5 Dec 2016 03:12:30 +0000 (11:12 +0800)]
MDL-56614 behat: new steps for navigation without blocks

4 years agoMDL-56301 course: Use value for intro field if set in a mods function
Donald Barrett [Wed, 16 Nov 2016 09:08:59 +0000 (22:08 +1300)]
MDL-56301 course: Use value for intro field if set in a mods function

Respects a module that has set a value for the db field intro in it's lib function modulename_add_instance.

4 years agoMerge branch 'MDL-57255-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 6 Dec 2016 02:16:38 +0000 (10:16 +0800)]
Merge branch 'MDL-57255-master' of git://github.com/jleyva/moodle

4 years agoMDL-57161 search: Set the correct HTTP header
David Monllao [Mon, 28 Nov 2016 01:57:32 +0000 (09:57 +0800)]
MDL-57161 search: Set the correct HTTP header

All credit goes to Test Valley School

4 years agoMerge branch 'MDL-56759-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 6 Dec 2016 00:56:27 +0000 (08:56 +0800)]
Merge branch 'MDL-56759-master' of git://github.com/lameze/moodle

4 years agoMDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts
Eloy Lafuente (stronk7) [Mon, 5 Dec 2016 16:10:20 +0000 (17:10 +0100)]
MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts

4 years agoMerge branch 'MDL-56459-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 5 Dec 2016 15:48:27 +0000 (15:48 +0000)]
Merge branch 'MDL-56459-master' of git://github.com/FMCorz/moodle

4 years agoMDL-56240 upgrade: delete incorrect lines, manually added
Eloy Lafuente (stronk7) [Mon, 5 Dec 2016 15:47:33 +0000 (16:47 +0100)]
MDL-56240 upgrade: delete incorrect lines, manually added

Note that, with MDL-57266, we are changine the comment to be:

// Automatically generated Moodle v3.2.0 release upgrade line

in order to make to make to make it clearer that it's an
automatic (part of the release process) comment and should not
be added manually ever.

4 years agoMerge branch 'MDL-57256-master-legacylink' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 5 Dec 2016 15:45:31 +0000 (15:45 +0000)]
Merge branch 'MDL-57256-master-legacylink' of git://github.com/mudrd8mz/moodle

4 years agoMDL-56759 themes: fix badge list alignment issues
Simey Lameze [Fri, 25 Nov 2016 06:51:24 +0000 (14:51 +0800)]
MDL-56759 themes: fix badge list alignment issues

4 years agoMerge branch 'MDL-54921-master' of https://github.com/xow/moodle
Andrew Nicols [Mon, 5 Dec 2016 07:13:47 +0000 (15:13 +0800)]
Merge branch 'MDL-54921-master' of https://github.com/xow/moodle

4 years agoMerge branch 'MDL-52840_master' of https://github.com/rezaies/moodle
Andrew Nicols [Mon, 5 Dec 2016 05:01:31 +0000 (13:01 +0800)]
Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle

4 years agoMerge branch 'MDL-57084_master' of git://github.com/markn86/moodle
Andrew Nicols [Mon, 5 Dec 2016 04:26:20 +0000 (12:26 +0800)]
Merge branch 'MDL-57084_master' of git://github.com/markn86/moodle

4 years agoMDL-57084 core_message: prevent duplication of day separator
Mark Nelson [Wed, 30 Nov 2016 03:05:09 +0000 (11:05 +0800)]
MDL-57084 core_message: prevent duplication of day separator

4 years agoMerge branch 'MDL-56893-MOODLE_master-edit-grade-item-bug' of https://github.com...
Andrew Nicols [Mon, 5 Dec 2016 04:04:43 +0000 (12:04 +0800)]
Merge branch 'MDL-56893-MOODLE_master-edit-grade-item-bug' of https://github.com/mspall/moodle

4 years agoMerge branch 'MDL-57265' of git://github.com/stronk7/moodle
Andrew Nicols [Mon, 5 Dec 2016 00:51:21 +0000 (08:51 +0800)]
Merge branch 'MDL-57265' of git://github.com/stronk7/moodle

4 years agoMDL-56836 SCORM: player doesn't remember display mode when not logged in
Bram Tassyns [Wed, 9 Nov 2016 06:54:59 +0000 (07:54 +0100)]
MDL-56836 SCORM: player doesn't remember display mode when not logged in

4 years agoMDL-57265 backup: Bump release to 3.3
Eloy Lafuente (stronk7) [Mon, 5 Dec 2016 00:30:17 +0000 (01:30 +0100)]
MDL-57265 backup: Bump release to 3.3

4 years agoMDL-56233 forms library: Fixed form identifier when mocking a form.
Daniel Thee Roperto [Mon, 3 Oct 2016 07:23:06 +0000 (18:23 +1100)]
MDL-56233 forms library: Fixed form identifier when mocking a form.

If the plugin is using namespaces instead of frankenstyle class name,
get_called_class() will return 'type\name' instead of 'type_name'.

Added code to replace backslashes to underscores and fix that issue.

4 years agoweekly back-to-dev release 3.3dev
Eloy Lafuente (stronk7) [Sat, 3 Dec 2016 16:46:27 +0000 (17:46 +0100)]
weekly back-to-dev release 3.3dev

4 years agoMDL-45873 mode_data: Allow "0" entries in menu field
Henning Bostelmann [Sat, 3 Dec 2016 15:30:12 +0000 (15:30 +0000)]
MDL-45873 mode_data: Allow "0" entries in menu field

4 years agoNOBUG: Change travis.yml back to master
Eloy Lafuente (stronk7) [Sat, 3 Dec 2016 13:26:16 +0000 (14:26 +0100)]
NOBUG: Change travis.yml back to master

4 years agoMoodle release 3.2 v3.2.0
Eloy Lafuente (stronk7) [Sat, 3 Dec 2016 13:26:14 +0000 (14:26 +0100)]
Moodle release 3.2

4 years agoNOBUG: Change travis.yml to MOODLE_32_STABLE
Eloy Lafuente (stronk7) [Sat, 3 Dec 2016 13:26:15 +0000 (14:26 +0100)]
NOBUG: Change travis.yml to MOODLE_32_STABLE

4 years agoMoodle release 3.2rc5 v3.2.0-rc5
Dan Poltawski [Fri, 2 Dec 2016 15:19:10 +0000 (15:19 +0000)]
Moodle release 3.2rc5

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 2 Dec 2016 15:19:09 +0000 (15:19 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMerge branch 'wip-mdl-57232' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Fri, 2 Dec 2016 15:00:48 +0000 (15:00 +0000)]
Merge branch 'wip-mdl-57232' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-57232 behat: Add blocks in boost theme
Rajesh Taneja [Fri, 2 Dec 2016 14:47:57 +0000 (22:47 +0800)]
MDL-57232 behat: Add blocks in boost theme

Currently behat in boost depend on blocks
so make sure we have them.

4 years agoMerge branch 'wip-mdl-57245' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Fri, 2 Dec 2016 13:15:27 +0000 (14:15 +0100)]
Merge branch 'wip-mdl-57245' of https://github.com/rajeshtaneja/moodle

4 years agoMDL-57256 course: Fix display of the Legacy course files link
David Mudrák [Fri, 2 Dec 2016 13:10:06 +0000 (14:10 +0100)]
MDL-57256 course: Fix display of the Legacy course files link

The patch fixes the classical operator precedence bug.

4 years agoMDL-57255 gradereport_user: Fix default value for graderaw
Juan Leyva [Fri, 2 Dec 2016 12:29:51 +0000 (12:29 +0000)]
MDL-57255 gradereport_user: Fix default value for graderaw

graderaw is a PARAM_FLOAT, the default to empty string was incorrect

4 years agoMDL-57245 behat: Use correct @_file_upload tag
Rajesh Taneja [Fri, 2 Dec 2016 02:05:12 +0000 (10:05 +0800)]
MDL-57245 behat: Use correct @_file_upload tag

4 years agoMerge branch 'MDL-57193-master-notest' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Fri, 2 Dec 2016 10:41:02 +0000 (11:41 +0100)]
Merge branch 'MDL-57193-master-notest' of git://github.com/FMCorz/moodle

4 years agoMDL-56553 usertours: fix apostrophe use
Dan Poltawski [Fri, 2 Dec 2016 09:22:06 +0000 (09:22 +0000)]
MDL-56553 usertours: fix apostrophe use

4 years agoMDL-57193 auth_db: Flip the array outside the loop for better perf
Frederic Massart [Fri, 2 Dec 2016 08:02:00 +0000 (16:02 +0800)]
MDL-57193 auth_db: Flip the array outside the loop for better perf

Also as the recent changes where affecting the whitespaces quite
a lot, I took the liberty of aligning a few lines which weren't.

4 years agoMDL-57193 auth_db: Use a recordset and array_key_exists
John Okely [Fri, 2 Dec 2016 06:34:18 +0000 (14:34 +0800)]
MDL-57193 auth_db: Use a recordset and array_key_exists

4 years agoMDL-57193 auth_db: Fixed bug suspends all users if external DB has > 10k
Josh Willcock [Tue, 29 Nov 2016 17:55:04 +0000 (17:55 +0000)]
MDL-57193 auth_db: Fixed bug suspends all users if external DB has > 10k

4 years agoMDL-56553 usertours: Removing trailing ^M
David Monllao [Fri, 2 Dec 2016 08:23:03 +0000 (16:23 +0800)]
MDL-56553 usertours: Removing trailing ^M

4 years agoMDL-56553 tool_usertours: change add a block step to position right
Ryan Wyllie [Fri, 2 Dec 2016 07:53:07 +0000 (07:53 +0000)]
MDL-56553 tool_usertours: change add a block step to position right

4 years agoMerge branch 'MDL-57232-master' of git://github.com/damyon/moodle
David Monllao [Fri, 2 Dec 2016 06:20:17 +0000 (14:20 +0800)]
Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'MDL-57209-master' of git://github.com/crmpicco/moodle
David Monllao [Fri, 2 Dec 2016 05:26:56 +0000 (13:26 +0800)]
Merge branch 'MDL-57209-master' of git://github.com/crmpicco/moodle

4 years agoMDL-57232 blocks: Split undeletableblocktypes
Damyon Wiese [Fri, 2 Dec 2016 02:00:43 +0000 (10:00 +0800)]
MDL-57232 blocks: Split undeletableblocktypes

There are 2 kinds of blocks that are undeletable. Those required by the
theme and those protected via the admin page ui. We only want the theme
ones to be auto created site wide if they don't exist - so we need to
rename the theme ones and split the logic.

4 years agoMDL-57243 search: Correct todo doc
Andrew Nicols [Fri, 2 Dec 2016 02:53:52 +0000 (10:53 +0800)]
MDL-57243 search: Correct todo doc

4 years agoMerge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Fri, 2 Dec 2016 02:49:34 +0000 (10:49 +0800)]
Merge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle

4 years agoMDL-57243 search: Note about search area base classes relocation
David Monllao [Fri, 2 Dec 2016 01:24:35 +0000 (09:24 +0800)]
MDL-57243 search: Note about search area base classes relocation

4 years agoMDL-57101 media_videojs: Load legacy events before use
Andrew Nicols [Fri, 2 Dec 2016 00:58:19 +0000 (08:58 +0800)]
MDL-57101 media_videojs: Load legacy events before use

4 years agoMerge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle
Eloy Lafuente (stronk7) [Thu, 1 Dec 2016 16:58:51 +0000 (17:58 +0100)]
Merge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle

4 years agoMDL-57234 Quiz report: fix exception in Responses for all users
John Beedell [Thu, 1 Dec 2016 15:47:19 +0000 (15:47 +0000)]
MDL-57234 Quiz report: fix exception in Responses for all users

4 years agoMerge branch 'MDL-57220-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 1 Dec 2016 13:20:15 +0000 (13:20 +0000)]
Merge branch 'MDL-57220-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'MDL-57194-master' of git://github.com/lameze/moodle
Dan Poltawski [Thu, 1 Dec 2016 12:20:01 +0000 (12:20 +0000)]
Merge branch 'MDL-57194-master' of git://github.com/lameze/moodle