Andrew Nicols [Tue, 14 Jun 2016 00:49:41 +0000 (08:49 +0800)]
Merge branch 'MDL-51978-master' of https://github.com/jtc/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jun 2016 18:05:13 +0000 (20:05 +0200)]
Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 13 Jun 2016 08:48:47 +0000 (09:48 +0100)]
Merge branch 'MDL-51683-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jun 2016 08:35:58 +0000 (09:35 +0100)]
Merge branch 'MDL-54772-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 13 Jun 2016 08:17:49 +0000 (09:17 +0100)]
Merge branch 'MDL-54562_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 13 Jun 2016 07:51:56 +0000 (08:51 +0100)]
Merge branch 'MDL-54837-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 13 Jun 2016 07:36:38 +0000 (08:36 +0100)]
Merge branch 'MDL-54842-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 3 Jun 2016 02:10:06 +0000 (10:10 +0800)]
MDL-54772 mod_assign: Fixes for PDF editor
* Render the annotations and comments within the drawing canvas, not in
the drawing region.
* Remove edit-related event bindings for stamp annotations.
Andrew Nicols [Mon, 13 Jun 2016 01:17:53 +0000 (09:17 +0800)]
Merge branch 'MDL-24064-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Sat, 14 May 2016 08:06:56 +0000 (09:06 +0100)]
MDL-54890 course: remove erranous duplicated switch label
Detected by eslint rule 'no-duplicate-case'
Dan Poltawski [Wed, 11 May 2016 15:42:15 +0000 (16:42 +0100)]
MDL-54890 assignfeedback_editpdf: Fix missing semicolon
Detected by eslint rule 'semi'
Jun Pataleta [Wed, 8 Jun 2016 05:16:07 +0000 (13:16 +0800)]
MDL-54842 core_renderer: Hide additional body HTML in embedded layout
Dan Poltawski [Thu, 9 Jun 2016 10:25:51 +0000 (11:25 +0100)]
weekly on-sync release 3.2dev
Dan Poltawski [Thu, 9 Jun 2016 10:25:49 +0000 (11:25 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 9 Jun 2016 01:53:48 +0000 (09:53 +0800)]
MDL-54853 weblib: Specify version and fixed encoding
Andrew Nicols [Thu, 9 Jun 2016 01:41:53 +0000 (09:41 +0800)]
Merge branch 'MDL-54853-master' of git://github.com/cameron1729/moodle
Cameron Ball [Wed, 8 Jun 2016 07:55:56 +0000 (15:55 +0800)]
MDL-54853 weblib: Properly specify encoding for blanktarget
Andrew Nicols [Wed, 8 Jun 2016 00:15:23 +0000 (08:15 +0800)]
Merge branch 'MDL-53947-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 7 Jun 2016 11:15:19 +0000 (12:15 +0100)]
MDL-46721 assign: clarify ternerary statement
Dan Poltawski [Tue, 7 Jun 2016 11:12:28 +0000 (12:12 +0100)]
Merge branch 'MDL-46721-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Tue, 7 Jun 2016 10:49:39 +0000 (11:49 +0100)]
Merge branch 'MDL-48756-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 7 Jun 2016 09:44:27 +0000 (10:44 +0100)]
MDL-54729 mod_forum: clarify static variable usage
After some time discussing with integrators, we decided that this
slightly yukky solution probably fits safely, so just making its usage
better explained and speciifc.
Adrian Greeve [Tue, 31 May 2016 03:44:57 +0000 (11:44 +0800)]
MDL-54729 mod_forum: Deep link highlighting works in IE.
Dan Poltawski [Tue, 7 Jun 2016 08:41:27 +0000 (09:41 +0100)]
Merge branch 'MDL-54765-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 7 Jun 2016 08:15:43 +0000 (16:15 +0800)]
Merge branch 'MDL-54180_master' of https://github.com/marxjohnson/moodle
Skylar Kelty [Tue, 26 Apr 2016 07:35:00 +0000 (08:35 +0100)]
MDL-53947 memcached: Fix memcached session warning on PHP7
Marina Glancy [Tue, 7 Jun 2016 00:58:59 +0000 (08:58 +0800)]
MDL-54837 tags: allow to specify static function as callback
Marina Glancy [Mon, 6 Jun 2016 08:07:30 +0000 (16:07 +0800)]
MDL-54837 tags: fixed bug when collection is locked
also fixed fatal error for upgraded plugins that did not pass tag
component to the tag form element
Eloy Lafuente (stronk7) [Mon, 6 Jun 2016 22:04:59 +0000 (00:04 +0200)]
Merge branch 'MDL-54739-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Mon, 6 Jun 2016 21:56:25 +0000 (23:56 +0200)]
Merge branch 'MDL-54769-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 6 Jun 2016 16:06:36 +0000 (18:06 +0200)]
Merge branch 'MDL-54805-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 6 Jun 2016 14:07:01 +0000 (15:07 +0100)]
Merge branch 'wip-MDL-50824-master' of https://github.com/cdsmith-umn/moodle
Dan Poltawski [Mon, 6 Jun 2016 13:09:59 +0000 (14:09 +0100)]
Merge branch 'MDL-54820-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 6 Jun 2016 12:41:48 +0000 (13:41 +0100)]
Merge branch 'MDL-54702_master' of https://github.com/snake/moodle
Dan Poltawski [Mon, 6 Jun 2016 12:21:09 +0000 (13:21 +0100)]
Merge branch 'MDL-53392_master' of https://github.com/snake/moodle
Dan Poltawski [Mon, 6 Jun 2016 12:17:13 +0000 (13:17 +0100)]
Merge branch 'MDL-54557-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 6 Jun 2016 10:59:42 +0000 (11:59 +0100)]
Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Mon, 6 Jun 2016 09:23:09 +0000 (11:23 +0200)]
Merge branch 'MDL-41922-master-c' of git://github.com/FMCorz/moodle
Mike Churchward [Thu, 2 Jun 2016 14:32:43 +0000 (10:32 -0400)]
MDL-54805 portfolio_download: Adding a 'require' of necessary library file
AMOS bot [Fri, 3 Jun 2016 16:04:17 +0000 (00:04 +0800)]
Automatically generated installer lang files
Juan Leyva [Fri, 3 Jun 2016 10:56:11 +0000 (12:56 +0200)]
MDL-54820 webservice: Fix regression in core_course_search_courses
Regression caused by MDL-51324
Jun Pataleta [Tue, 31 May 2016 10:09:21 +0000 (18:09 +0800)]
MDL-54765 mod_assign: Use selectedIndex for setting page selection
Set the 'selectedIndex' attribute of the page selection element instead of
the 'value' attribute since YUI is having trouble with this in IE.
Frederic Massart [Tue, 24 May 2016 02:51:14 +0000 (10:51 +0800)]
MDL-41922 mod_quiz: Don't report quiz due when an attempt was finished
Andrew Nicols [Fri, 3 Jun 2016 04:09:19 +0000 (12:09 +0800)]
weekly on-sync release 3.2dev
Andrew Nicols [Fri, 3 Jun 2016 04:09:16 +0000 (12:09 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Simey Lameze [Fri, 3 Jun 2016 02:34:53 +0000 (10:34 +0800)]
MDL-54739 blocks: fix activity chooser link alignment
Thanks Ryan Wyllie for the help.
Clement Smith [Tue, 31 May 2016 19:05:44 +0000 (14:05 -0500)]
MDL-50824 message/externallib.php: Fix get_string call
This fixes the get_string call by adding the intended recipient's
fullname as the third argument when a user tries to message the
recipient, the recipient is blocking non-contacts from messaging
them, and the user is not in the recipient's contact list.
Marina Glancy [Mon, 16 May 2016 00:36:42 +0000 (08:36 +0800)]
MDL-54557 course: treat section summary as contents
Andrew Nicols [Thu, 2 Jun 2016 02:07:52 +0000 (10:07 +0800)]
MDL-54722 javascript: Add YUI depend wrapper to global event
AMOS bot [Wed, 1 Jun 2016 16:04:13 +0000 (00:04 +0800)]
Automatically generated installer lang files
Frederic Massart [Wed, 1 Jun 2016 05:45:47 +0000 (13:45 +0800)]
MDL-48248 enrol_manual: Handle durations more precise than int days
Frederic Massart [Tue, 31 May 2016 11:28:11 +0000 (19:28 +0800)]
MDL-48756 editor_atto: Bulk atto autosave queries
Andrew Nicols [Wed, 1 Jun 2016 04:24:14 +0000 (12:24 +0800)]
Merge branch 'MDL-54722-master' of git://github.com/cameron1729/moodle
Cameron Ball [Tue, 31 May 2016 08:56:09 +0000 (16:56 +0800)]
MDL-54722 navigation: Properly overflow expanded nav trees
Jake Dallimore [Fri, 27 May 2016 08:49:38 +0000 (16:49 +0800)]
MDL-54702 mod_lti: Support standard cartridge icons in LTI import
Marina Glancy [Tue, 31 May 2016 02:37:08 +0000 (10:37 +0800)]
MDL-54769 backup: add missing error language string
Andrew Nicols [Wed, 1 Jun 2016 00:02:32 +0000 (08:02 +0800)]
Merge branch 'MDL-53598-master' of git://github.com/marinaglancy/moodle
Mark Johnson [Thu, 12 May 2016 08:49:24 +0000 (09:49 +0100)]
MDL-54180 Behat: Handle exceptions from driver when saving screenshot
Marina Glancy [Thu, 26 May 2016 09:18:13 +0000 (17:18 +0800)]
MDL-53598 block_glossary_random: do not fail if glossary was deleted
This commit refactors how associated glossary is searched for and removes
unnecessary DB queries. Also prevents from situations when the global glossary or course have
been deleted
David Monllao [Tue, 31 May 2016 07:27:29 +0000 (15:27 +0800)]
Merge branch 'MDL-54065-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 31 May 2016 05:29:48 +0000 (13:29 +0800)]
Merge branch 'MDL-54655_m32v1' of https://github.com/sbourget/moodle
David Monllao [Tue, 31 May 2016 04:46:59 +0000 (12:46 +0800)]
Merge branch 'MDL-54667-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 31 May 2016 04:31:36 +0000 (12:31 +0800)]
Merge branch 'MDL-54763_master' of git://github.com/markn86/moodle
David Monllao [Tue, 31 May 2016 03:46:09 +0000 (11:46 +0800)]
Merge branch 'MDL-53851-master' of https://github.com/blckct/moodle
David Monllao [Tue, 31 May 2016 03:42:17 +0000 (11:42 +0800)]
Merge branch 'MDL-53938' of git://github.com/timhunt/moodle
David Monllao [Tue, 31 May 2016 03:32:11 +0000 (11:32 +0800)]
Merge branch 'MDL-54605' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 31 May 2016 03:18:27 +0000 (11:18 +0800)]
Merge branch 'MDL-54579_m31v1' of https://github.com/sbourget/moodle
Barbara Ramiro [Thu, 26 May 2016 02:47:23 +0000 (10:47 +0800)]
MDL-51683 design: New icon for competencies
Jakub Kania [Mon, 23 May 2016 15:39:12 +0000 (17:39 +0200)]
MDL-54667 core_lib: Fix the param name in edit profile link
Cameron Ball [Mon, 30 May 2016 07:19:36 +0000 (15:19 +0800)]
MDL-37138 weblib: Document blanktarget in upgrade.txt
David Monllao [Mon, 30 May 2016 08:08:53 +0000 (16:08 +0800)]
Merge branch 'MDL-54002_m32v3' of https://github.com/sbourget/moodle
David Monllao [Mon, 30 May 2016 08:04:04 +0000 (16:04 +0800)]
Merge branch 'MDL-54010-master' of git://github.com/cameron1729/moodle
David Monllao [Mon, 30 May 2016 07:45:47 +0000 (15:45 +0800)]
Merge branch 'MDL-54577-master' of git://github.com/cameron1729/moodle
David Monllao [Mon, 30 May 2016 07:40:43 +0000 (15:40 +0800)]
Merge branch 'MDL-29905-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 30 May 2016 07:36:01 +0000 (15:36 +0800)]
Merge branch 'MDL-54116-master' of git://github.com/cameron1729/moodle
David Monllao [Mon, 30 May 2016 07:29:22 +0000 (15:29 +0800)]
Merge branch 'MDL-49943-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 30 May 2016 07:19:04 +0000 (15:19 +0800)]
Merge branch 'MDL-54756' of git://github.com/timhunt/moodle
David Monllao [Mon, 30 May 2016 07:02:17 +0000 (15:02 +0800)]
Merge branch 'MDL-37138-master-2' of git://github.com/cameron1729/moodle
Andrew Nicols [Mon, 30 May 2016 06:39:23 +0000 (14:39 +0800)]
Merge branch 'MDL-54567-master-build' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 25 May 2016 13:21:19 +0000 (21:21 +0800)]
MDL-49943 mod_choice: display multiple answers in complete report
Jun Pataleta [Mon, 30 May 2016 05:45:12 +0000 (13:45 +0800)]
MDL-53425 blocklib: Raise execution time for dashboard reset process
Andrew Nicols [Mon, 30 May 2016 05:38:52 +0000 (13:38 +0800)]
Merge branch 'MDL-35987-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 30 May 2016 05:35:24 +0000 (13:35 +0800)]
Merge branch 'MDL-53425-master-delete-by-chunks' of git://github.com/junpataleta/moodle
Mark Nelson [Mon, 30 May 2016 05:28:09 +0000 (13:28 +0800)]
MDL-54763 tool_lp: fixed typo in HTML tag
Andrew Nicols [Mon, 30 May 2016 04:39:30 +0000 (12:39 +0800)]
MDL-54567 backup: Fixtures for legacy grade value rewrite
Frederic Massart [Wed, 18 May 2016 10:01:17 +0000 (18:01 +0800)]
MDL-54567 backup: Process the calculations_freeze item upon restore
Cameron Ball [Fri, 27 May 2016 02:33:55 +0000 (10:33 +0800)]
MDL-37138 chat: Use blanktarget option for chat text
Cameron Ball [Fri, 27 May 2016 02:26:47 +0000 (10:26 +0800)]
MDL-37138 message: Use blanktarget option for message text
Cameron Ball [Fri, 27 May 2016 02:25:40 +0000 (10:25 +0800)]
MDL-37138 weblib: Add blanktarget option to format_text
David Monllao [Mon, 30 May 2016 05:02:34 +0000 (13:02 +0800)]
Merge branch 'MDL-48248-master' of git://github.com/FMCorz/moodle
Frederic Massart [Wed, 25 May 2016 09:42:43 +0000 (17:42 +0800)]
MDL-29905 question: Auto remove stale questions upon category deletion
Eric Merrill [Thu, 29 May 2014 21:19:37 +0000 (17:19 -0400)]
MDL-29905 question: Try to delete unused hidden/random questions
Before going to display the warning about moving in use questions,
try to delete unused Random qtype questions, as well as 'hidden'
questions (these are questions that were deleted from the category),
but were in use at the time.
Jun Pataleta [Mon, 11 Apr 2016 02:10:00 +0000 (10:10 +0800)]
MDL-53425 blocklib: Perform deletion of block instances by chunk
David Monllao [Mon, 30 May 2016 03:15:20 +0000 (11:15 +0800)]
Merge branch 'MDL-54721-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 30 May 2016 03:08:46 +0000 (11:08 +0800)]
Merge branch 'MDL-43887-master' of git://github.com/cameron1729/moodle
David Monllao [Mon, 30 May 2016 02:51:33 +0000 (10:51 +0800)]
Merge branch 'MDL-51806_master' of https://github.com/snake/moodle
Jake Dallimore [Wed, 25 May 2016 01:39:17 +0000 (09:39 +0800)]
MDL-51806 mod_workshop: Add locale support for grade values.
David Monllao [Mon, 30 May 2016 02:19:24 +0000 (10:19 +0800)]
Merge branch 'wip-MDL-45427-master' of git://github.com/abgreeve/moodle
Marina Glancy [Tue, 10 May 2016 06:17:57 +0000 (14:17 +0800)]
MDL-54065 gradebook: correctly display module icon
Stephen Bourget [Fri, 27 May 2016 22:21:25 +0000 (18:21 -0400)]
MDL-54655 Behat: Tests for the online_users block
