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
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
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
Andrew Nicols [Wed, 1 Jun 2016 00:02:32 +0000 (08:02 +0800)]
Merge branch 'MDL-53598-master' of git://github.com/marinaglancy/moodle
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
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
Tim Hunt [Fri, 27 May 2016 18:55:25 +0000 (19:55 +0100)]
MDL-54756 moodle_url: remove dangerous trim from make_file_url
This was a regression caused by MDL-50268. It broke qtype_stack.
Tim Hunt [Mon, 16 May 2016 22:14:22 +0000 (23:14 +0100)]
MDL-54605 quiz regrading: incorrect DB query
There were two issues. With groups, the $params array was wrong
due to PHP + vs array_merge sillyness.
Also, the first column in the SQL was not necessarily unique,
so we need to use a recordset rather than get_records.
Cameron Ball [Thu, 26 May 2016 17:21:34 +0000 (01:21 +0800)]
MDL-43887 formslib: Allow not set date field
Previously if the date field was not enabled it would
be treated as having value 0. A bug would allow this 0
to pass through and save the date as 1 January 1970
AMOS bot [Thu, 26 May 2016 16:04:40 +0000 (00:04 +0800)]
Automatically generated installer lang files
Frederic Massart [Thu, 26 May 2016 09:52:34 +0000 (17:52 +0800)]
MDL-54721 report_competency: Do not ignore the first user selection
Cameron Ball [Wed, 25 May 2016 04:50:18 +0000 (12:50 +0800)]
MDL-54010 roles: Specify encoding for escaped export data
Nigel Cunningham [Mon, 2 May 2016 05:13:20 +0000 (15:13 +1000)]
MDL-54010 roles: Fix missing HTMLspecialchars in role export code.
Role name and description fields are currently not escaped when
exporting a role. This results in an unusable file when characters
such as ampersands are used in a name or description. Fix this by
using htmlspecialchars on both fields.
Signed-off-by: Nigel Cunningham <nigelc@catalyst-au.net>
Stephen Bourget [Tue, 17 May 2016 00:09:50 +0000 (20:09 -0400)]
MDL-54577 Behat: Add tests for messages block
Marina Glancy [Mon, 16 May 2016 02:22:40 +0000 (10:22 +0800)]
MDL-54116 block_comments: warnings when commenting outside of a course
Stephen Bourget [Mon, 9 May 2016 22:58:05 +0000 (18:58 -0400)]
MDL-54116 block_comments: behat test
Eloy Lafuente (stronk7) [Thu, 26 May 2016 00:15:53 +0000 (02:15 +0200)]
weekly on-sync release 3.2dev
Eloy Lafuente (stronk7) [Thu, 26 May 2016 00:15:50 +0000 (02:15 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jakub Kania [Mon, 23 May 2016 15:19:01 +0000 (17:19 +0200)]
MDL-53851 news block: Display news from all the accessible groups
David Monllao [Wed, 25 May 2016 08:17:44 +0000 (16:17 +0800)]
Merge branch 'MDL-54059-master' of git://github.com/andrewnicols/moodle
Adrian Greeve [Wed, 25 May 2016 07:12:26 +0000 (15:12 +0800)]
MDL-45427 mod_data: Inserting tags into templates.
Allows tags to be inserted into the editor without
having to touch Atto at all.
Frederic Massart [Tue, 24 May 2016 09:01:33 +0000 (17:01 +0800)]
MDL-35987 qtype_multianswer: Prevent restore failure due to bad sequence
Andrew Nicols [Thu, 5 May 2016 06:31:59 +0000 (14:31 +0800)]
MDL-54059 testing: Add grunt test
Andrew Nicols [Thu, 5 May 2016 06:29:52 +0000 (14:29 +0800)]
MDL-54059 testing: Simplify travis output
Frederic Massart [Mon, 23 May 2016 06:58:55 +0000 (14:58 +0800)]
MDL-48248 enrol_manual: Ensure that the default value is always selected
Stephen Bourget [Tue, 24 May 2016 16:42:31 +0000 (12:42 -0400)]
MDL-54002 Behat: tests for recent blogs block
AMOS bot [Tue, 24 May 2016 16:04:41 +0000 (00:04 +0800)]
Automatically generated installer lang files
Andrew Nicols [Tue, 24 May 2016 06:53:24 +0000 (14:53 +0800)]
Merge branch 'MDL-54715-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 24 May 2016 06:22:41 +0000 (14:22 +0800)]
MDL-54715 core_question: fixed bug when importing questions with tags
Thanks to WangYang for original patch
David Monllao [Tue, 24 May 2016 06:20:13 +0000 (14:20 +0800)]
Merge branch 'MDL-54675-forum-highlight' of https://github.com/brendanheywood/moodle
David Monllao [Tue, 24 May 2016 03:17:08 +0000 (11:17 +0800)]
Merge branch 'MDL-54582' of git://github.com/timhunt/moodle
Brendan Heywood [Tue, 24 May 2016 03:06:30 +0000 (13:06 +1000)]
MDL-54675 forum: Fixed bug with multiple adjacent hash anchors
Andrew Nicols [Tue, 24 May 2016 01:02:36 +0000 (09:02 +0800)]
MDL-53687 core_media: Comment fix
Andrew Nicols [Tue, 24 May 2016 00:59:47 +0000 (08:59 +0800)]
Merge branch 'MDL-53687-master' of git://github.com/FMCorz/moodle
AMOS bot [Mon, 23 May 2016 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files
Frederic Massart [Mon, 23 May 2016 08:20:15 +0000 (16:20 +0800)]
MDL-53687 core_media: Edge does not yet support WebM and OGG
David Monllao [Mon, 23 May 2016 06:52:54 +0000 (14:52 +0800)]
Merge branch 'MDL-54642-master' of git://github.com/ryanwyllie/moodle
David Monllao [Mon, 23 May 2016 06:38:01 +0000 (14:38 +0800)]
Merge branch 'MDL-46934-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 23 May 2016 06:23:57 +0000 (14:23 +0800)]
Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 23 May 2016 01:50:44 +0000 (09:50 +0800)]
Merge branch 'MDL-54664-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 23 May 2016 01:13:40 +0000 (09:13 +0800)]
Merge branch 'MDL-54677' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Sun, 22 May 2016 23:31:34 +0000 (01:31 +0200)]
MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts
Eloy Lafuente (stronk7) [Sun, 22 May 2016 22:23:31 +0000 (00:23 +0200)]
MDL-54676 backup: Bump release to 3.2
Eloy Lafuente (stronk7) [Sun, 22 May 2016 00:46:17 +0000 (02:46 +0200)]
weekly back-to-dev release 3.2dev
Eloy Lafuente (stronk7) [Sat, 21 May 2016 21:51:53 +0000 (23:51 +0200)]
Moodle release 3.1
Eloy Lafuente (stronk7) [Sat, 21 May 2016 10:36:51 +0000 (12:36 +0200)]
Merge branch 'wip-MDL-54666-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Sat, 21 May 2016 10:26:01 +0000 (12:26 +0200)]
Merge branch 'MDL-54672-master-given-i-enrol' of git://github.com/mudrd8mz/moodle
Marina Glancy [Sat, 21 May 2016 04:37:30 +0000 (12:37 +0800)]
MDL-54666 modedit: use default values when modgrade element is frozen
Eloy Lafuente (stronk7) [Fri, 20 May 2016 21:45:36 +0000 (23:45 +0200)]
MDL-54666 tests: Verify that any activity keeps the settings
This was affecting both to rateable (forum...) and not rateable
(assignment...) activities. So tests have been completed to verify
that now saving is performed and the correct scale values stored.
David Mudrák [Fri, 20 May 2016 18:29:29 +0000 (20:29 +0200)]
MDL-54672 behat: Fix i_enrol_user_as() step in non-js sessions
During the recent reimplementation of the step (
eb9ca848), we did not
notice that javascript variant uses the string `assignroles` while the
non-js variant uses string `assignrole`. This caused any "Given I enrol"
steps to fail in non-javascript sessions.
Dan Poltawski [Fri, 20 May 2016 09:10:15 +0000 (10:10 +0100)]
Moodle release 3.1rc2
Frederic Massart [Thu, 12 May 2016 04:57:08 +0000 (12:57 +0800)]
MDL-46934 webservice_rest: Fixed undefined index on XML output
Jun Pataleta [Fri, 20 May 2016 08:58:54 +0000 (16:58 +0800)]
MDL-54664 blocks_lp: Set the layout of to review pages to standard
Jun Pataleta [Fri, 20 May 2016 07:13:28 +0000 (15:13 +0800)]
MDL-54661 mod_assign: Unescape course name in grading nav template
David Monllao [Fri, 20 May 2016 05:53:26 +0000 (13:53 +0800)]
Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 20 May 2016 04:28:23 +0000 (12:28 +0800)]
MDL-54623 mod_assign: Fix for unit test
Fix mod_assign_external_testcase::test_list_participants_returns_user_property_types()
to avoid using hardcoded user properties.
Andrew Nicols [Fri, 20 May 2016 04:23:36 +0000 (12:23 +0800)]
Merge branches 'MDL-53988-master-fix3' and 'MDL-53988-master-fix3' of https://github.com/xow/moodle
John Okely [Fri, 20 May 2016 04:05:55 +0000 (12:05 +0800)]
MDL-53988 mod_lti: Remove popup for duplicate url
If creating a proxy fails, we will show an error using the
notification API. So we can remove the notification.exception call.
But modify the docs for ToolProxy.create so that future developers
will know they need to handle failures themselves.