Jun Pataleta [Tue, 5 Dec 2017 22:31:16 +0000 (11:31 +1300)]
Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle
Jun Pataleta [Tue, 5 Dec 2017 06:03:45 +0000 (19:03 +1300)]
Merge branch 'wip-MDL-60926-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 5 Dec 2017 05:56:04 +0000 (13:56 +0800)]
Merge branch 'MDL-37933_master' of git://github.com/markn86/moodle
David Herney [Tue, 28 Nov 2017 01:15:30 +0000 (20:15 -0500)]
MDL-60443 dataformat lib: Change a wrong variable name
The variable $type really is $dataformat. I have changed it for
prevent the error and show a correct error message.
Jun Pataleta [Tue, 5 Dec 2017 05:00:08 +0000 (18:00 +1300)]
Merge branch 'wip-MDL-34161-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 5 Dec 2017 04:48:52 +0000 (12:48 +0800)]
Merge branch 'MDL-60801' of https://github.com/andrewhancox/moodle
Andrew Nicols [Tue, 5 Dec 2017 04:16:47 +0000 (12:16 +0800)]
Merge branch 'MDL-60857-master' of https://github.com/sammarshallou/moodle
Andrew Nicols [Tue, 5 Dec 2017 03:48:42 +0000 (11:48 +0800)]
Merge branch 'MDL-60899-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 5 Dec 2017 03:00:54 +0000 (11:00 +0800)]
Merge branch 'MDL-59875_m35v1' of https://github.com/sbourget/moodle
Jun Pataleta [Tue, 5 Dec 2017 02:47:16 +0000 (15:47 +1300)]
Merge branch 'MDL-36056-master-fix1' of github.com/damyon/moodle
Andrew Nicols [Tue, 5 Dec 2017 01:51:37 +0000 (09:51 +0800)]
Merge branch 'MDL-47114-master' of git://github.com/rezaies/moodle
Damyon Wiese [Tue, 5 Dec 2017 01:49:33 +0000 (09:49 +0800)]
MDL-36056 forms: Don't validate disabled fields
When fields are disabled, the value comes through as null so we need to specifically check for it
before validation.
Andrew Nicols [Tue, 5 Dec 2017 01:18:25 +0000 (09:18 +0800)]
Merge branch 'wip-MDL-37757-master' of git://github.com/abgreeve/moodle
Luca Bösch [Tue, 28 Nov 2017 21:01:52 +0000 (22:01 +0100)]
MDL-32350 admin: Sort users by country ASC and DESC
Damyon Wiese [Mon, 4 Dec 2017 08:28:16 +0000 (16:28 +0800)]
Merge branch 'MDL-60219-master' of https://github.com/abias/moodle
Damyon Wiese [Mon, 4 Dec 2017 08:00:19 +0000 (16:00 +0800)]
Merge branch 'MDL-36056-master-enrolkeywhitespace' of git://github.com/mudrd8mz/moodle
Marina Glancy [Tue, 17 May 2016 03:13:37 +0000 (11:13 +0800)]
MDL-34161 mod_lti: backup and restore of submissions
Marina Glancy [Fri, 29 Apr 2016 12:31:04 +0000 (20:31 +0800)]
MDL-34161 mod_lti: backup/restore of lti types
Only course tools are backed up, site tools and registrations
can be matched by id if they are restored to the same site only.
For predefined course tools the secret is backed up encrypted
and can be restored on the same site only.
Tim Lock [Wed, 13 May 2015 03:49:18 +0000 (13:19 +0930)]
MDL-34161 mod_lti: Added Behat tests
Gregory Faller [Wed, 13 May 2015 03:49:10 +0000 (13:19 +0930)]
MDL-34161 mod_lti: Add support for restoring site tool
Jun Pataleta [Mon, 4 Dec 2017 05:24:15 +0000 (18:24 +1300)]
Merge branch 'wip-MDL-60887-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Mon, 4 Dec 2017 01:32:26 +0000 (14:32 +1300)]
Merge branch 'MDL-60925-master' of git://github.com/damyon/moodle
Marina Glancy [Fri, 1 Dec 2017 09:06:47 +0000 (17:06 +0800)]
MDL-60926 auth: do not map very long profile fields
Jun Pataleta [Sun, 3 Dec 2017 23:50:06 +0000 (12:50 +1300)]
Merge branch 'MDL-60914_master' of git://github.com/markn86/moodle
Shamim Rezaie [Mon, 27 Nov 2017 09:37:06 +0000 (17:37 +0800)]
MDL-47114 core: Improved function description
sam marshall [Mon, 20 Nov 2017 16:51:08 +0000 (16:51 +0000)]
MDL-60857 core_search: Improve cron log progress information
Eloy Lafuente (stronk7) [Thu, 30 Nov 2017 16:05:14 +0000 (17:05 +0100)]
weekly release 3.5dev
David Mudrák [Thu, 30 Nov 2017 09:47:57 +0000 (10:47 +0100)]
MDL-36056 form: Do not allow passwords with wrapping whitespace
This is to avoid accidental misconfiguration while copy/pasting the
password value.
Damyon Wiese [Wed, 29 Nov 2017 02:41:50 +0000 (10:41 +0800)]
MDL-60925 theme: Fix SCSS precompilation.
There is no point pre-compiling the theme SCSS if it is not stored somewhere that is available
to all webserving nodes. Localcache needs to be backed by the MUC cache.
Alexander Bias [Mon, 25 Sep 2017 10:28:17 +0000 (12:28 +0200)]
MDL-60219 lti: Replace pagelayout frametop with incourse
Damyon Wiese [Wed, 29 Nov 2017 04:18:21 +0000 (12:18 +0800)]
Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle
Jun Pataleta [Wed, 29 Nov 2017 03:59:25 +0000 (16:59 +1300)]
Merge branch 'wip-MDL-45068-master-fix' of https://github.com/marinaglancy/moodle
Marina Glancy [Wed, 29 Nov 2017 03:50:44 +0000 (11:50 +0800)]
MDL-45068 groups: corrected check for idnumber '0'
Jun Pataleta [Tue, 28 Nov 2017 21:51:22 +0000 (10:51 +1300)]
Merge branch 'MDL-50861-master' of git://github.com/junpataleta/moodle
Amy Groshek [Thu, 26 Oct 2017 21:43:33 +0000 (16:43 -0500)]
MDL-50861 mod_scorm: Add bootstrap btn classes to exit link
Eloy Lafuente (stronk7) [Tue, 28 Nov 2017 21:35:58 +0000 (22:35 +0100)]
Merge branch 'wip-MDL-60591-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 28 Nov 2017 19:59:22 +0000 (20:59 +0100)]
Merge branch 'MDL-60738-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 28 Nov 2017 19:48:15 +0000 (20:48 +0100)]
Merge branch 'MDL-60838-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 28 Nov 2017 19:37:59 +0000 (20:37 +0100)]
Merge branch 'MDL-60682' of git://github.com/timhunt/moodle
sam marshall [Tue, 28 Nov 2017 13:21:49 +0000 (13:21 +0000)]
MDL-60174 Document new dboption in config-dist.php
Stephen Bourget [Tue, 28 Nov 2017 13:03:02 +0000 (08:03 -0500)]
MDL-59875 Badges: Allow badges to be criteria for other badges
Jun Pataleta [Tue, 28 Nov 2017 07:10:08 +0000 (20:10 +1300)]
Merge branch 'MDL-54693-quiz-override-help-icon' of https://github.com/lucaboesch/moodle
Jun Pataleta [Tue, 28 Nov 2017 06:38:23 +0000 (19:38 +1300)]
Merge branch 'MDL-59574-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 28 Nov 2017 05:37:35 +0000 (13:37 +0800)]
MDL-60899 block_lp: no permissions - empty block
Show an empty block if the current user does not have the capability to see any plans.
Ankit Agarwal [Wed, 15 Nov 2017 04:50:49 +0000 (10:20 +0530)]
MDL-59574 analytics: Add model listing to enable_model cli script
Ankit Agarwal [Mon, 13 Nov 2017 10:17:58 +0000 (15:47 +0530)]
MDL-59574 tool_analytics: Add model listing to evaluate_model cli script
Damyon Wiese [Tue, 28 Nov 2017 05:18:03 +0000 (13:18 +0800)]
Merge branch 'MDL-53004-master' of https://github.com/lucaboesch/moodle
Conflicts:
mod/assign/styles.css
Jun Pataleta [Tue, 28 Nov 2017 04:18:54 +0000 (17:18 +1300)]
Merge branch 'MDL-46768-master' of git://github.com/sarjona/moodle
Damyon Wiese [Tue, 28 Nov 2017 04:14:08 +0000 (12:14 +0800)]
Merge branch 'MDL-24678-master-chat_get_latest_message' of https://github.com/bozoh/moodle
Damyon Wiese [Tue, 28 Nov 2017 04:05:21 +0000 (12:05 +0800)]
Merge branch 'MDL-60669-master' of git://github.com/tobiasreischmann/moodle
Damyon Wiese [Tue, 28 Nov 2017 03:38:40 +0000 (11:38 +0800)]
Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle
Mark Nelson [Tue, 28 Nov 2017 03:37:00 +0000 (11:37 +0800)]
MDL-60914 mod_lti: ensure grade_update() is defined during upgrade
Marina Glancy [Fri, 24 Nov 2017 01:56:52 +0000 (09:56 +0800)]
MDL-60887 registration: allow plugins to register on custom hubs
Jun Pataleta [Tue, 28 Nov 2017 00:25:51 +0000 (13:25 +1300)]
Merge branch 'wip-MDL-60478-m35' of git://github.com/amygroshek/moodle
Eloy Lafuente (stronk7) [Tue, 28 Nov 2017 00:16:40 +0000 (01:16 +0100)]
Merge branch 'MDL-60654' of https://github.com/joaociocca/moodle
Eloy Lafuente (stronk7) [Mon, 27 Nov 2017 23:55:23 +0000 (00:55 +0100)]
Merge branch 'MDL-60441_master' of git://github.com/juancs/moodle
Eloy Lafuente (stronk7) [Mon, 27 Nov 2017 23:48:41 +0000 (00:48 +0100)]
Merge branch 'MDL-60249-master' of git://github.com/damyon/moodle
sam marshall [Wed, 11 Oct 2017 11:16:12 +0000 (12:16 +0100)]
MDL-60174 core_dml: fix miscellaneous incorrect recordset usage
The new recordset support for Postgres requires transactions and
will cause errors if recordsets are not closed correctly. This
commit fixes problems that were identified during unit tests, and
via some basic code analysis, across all core code. Most of these
are incorrect usage of recordset (forgetting to close them).
sam marshall [Tue, 10 Oct 2017 14:08:54 +0000 (15:08 +0100)]
MDL-60174 core_dml: get_recordset on Postgres eats all the RAM
On Postgres, get_recordset_sql loads all the results into memory
(within the Postgres library, which doesn't count towards the PHP
memory limit, but does count towards making your server run out of
memory) as soon as the query completes.
This commit changes the code to use cursors, which in Postgres
allow the results to be returned in smaller chunks (by default
100,000 rows).
Tobias Reischmann [Mon, 6 Nov 2017 12:29:11 +0000 (13:29 +0100)]
MDL-60669 forum: Added duplicate check for restoring forum subscriptions
Before MDL-59854 it was possible to have duplicate forum subscriptions.
Trying to import backups created from back then, caused a DB exception
due to unqiue key constraints. Now only one of multiple identical forum
subscritions is restored.
Damyon Wiese [Mon, 27 Nov 2017 07:57:41 +0000 (15:57 +0800)]
Merge branch 'MDL-60188-master' of git://github.com/rezaies/moodle
Mark Nelson [Mon, 27 Nov 2017 07:26:43 +0000 (15:26 +0800)]
MDL-37933 core_complete: fixed criteria/criterion naming confusion
Jun Pataleta [Mon, 27 Nov 2017 06:43:32 +0000 (19:43 +1300)]
Merge branch 'MDL-57569-master' of git://github.com/sarjona/moodle
Jun Pataleta [Mon, 27 Nov 2017 06:36:00 +0000 (19:36 +1300)]
Merge branch 'wip-MDL-45068-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 26 Oct 2017 05:32:54 +0000 (13:32 +0800)]
MDL-60591 mod_forum: inline attachments are not displayed in plain text
Marina Glancy [Tue, 24 Oct 2017 03:14:21 +0000 (11:14 +0800)]
MDL-45068 groups: fixes to group import
- If 'coursename' is specified in the CSV it should match the course short name - thanks Yusuf Yılmaz for the patch
- If 'idnumber' is specified but 'groupidnumber' is not, idnumber should be used for matching the course idnumber only
- If 'groupingname' is not specified, there should be no notices (regression from MDL-42514)
- If 'coursename' or 'idnumber' column is present, it can contain empty values in some/all lines
Shamim Rezaie [Thu, 23 Nov 2017 15:15:27 +0000 (23:15 +0800)]
MDL-60188 groups: cache user's groups and groupings
The function groups_get_user_groups is called too often both before rendering the page and after the page is rendered (using ajax).
The function was executing a query joining 3 tables in each call. The plementation of the function has now modified to store the
query result in a request cache.
Jake Dallimore [Mon, 27 Nov 2017 02:29:55 +0000 (10:29 +0800)]
Merge branch 'MDL-60830-master' of git://github.com/sarjona/moodle
Jun Pataleta [Mon, 27 Nov 2017 02:05:46 +0000 (15:05 +1300)]
Merge branch 'MDL-58887-master' of git://github.com/ryanwyllie/moodle
Jake Dallimore [Mon, 27 Nov 2017 01:43:44 +0000 (09:43 +0800)]
Merge branch 'MDL-27230-master' of https://github.com/lucaboesch/moodle
Jun Pataleta [Sun, 26 Nov 2017 22:27:57 +0000 (11:27 +1300)]
Merge branch 'MDL-60904' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Sun, 26 Nov 2017 19:27:00 +0000 (20:27 +0100)]
MDL-60904 behat: Update master to use 3.35.0 behat extension tag
Andrew Hancox [Fri, 24 Nov 2017 15:29:23 +0000 (15:29 +0000)]
MDL-60801 tool_uploaduser: Fix issue with defaults being ignored
Carlos Alexandre S. da Fonseca [Tue, 21 Nov 2017 12:29:09 +0000 (10:29 -0200)]
MDL-24678 mod_chat: Fixed race condition on chat module
sam marshall [Thu, 16 Nov 2017 16:50:08 +0000 (16:50 +0000)]
MDL-60838 core_search: File upload does not honour timeout
Sara Arjona [Tue, 21 Nov 2017 13:45:26 +0000 (14:45 +0100)]
MDL-57569 core_files: Fix to let show generated f3 image
Sara Arjona [Thu, 16 Nov 2017 12:26:43 +0000 (13:26 +0100)]
MDL-46768 core_badges: changed badge name type from FILE to TEXT
Luca Bösch [Wed, 25 Oct 2017 16:21:10 +0000 (17:21 +0100)]
MDL-54693 quiz: Info for attempts allowed in user and group override.
Luca Bösch [Fri, 17 Nov 2017 23:14:09 +0000 (00:14 +0100)]
MDL-53004 assignment: Separate label and pulldown in grading (Clean)
Luca Bösch [Tue, 21 Nov 2017 07:33:25 +0000 (08:33 +0100)]
MDL-27230 quiz: remove and update group overrides in calendar
David Monllao [Thu, 23 Nov 2017 12:35:10 +0000 (13:35 +0100)]
weekly release 3.5dev
Damyon Wiese [Thu, 23 Nov 2017 04:25:31 +0000 (12:25 +0800)]
Merge branch 'wip-MDL-27886-master' of https://github.com/marinaglancy/moodle
Marina Glancy [Thu, 23 Nov 2017 04:21:03 +0000 (12:21 +0800)]
MDL-27886 backup: When setting is unlocked set it to original value
Jake Dallimore [Wed, 22 Nov 2017 07:36:45 +0000 (15:36 +0800)]
Merge branch 'MDL-60831-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Thu, 16 Nov 2017 09:35:23 +0000 (15:05 +0530)]
MDL-60831 search: add BS classes to block elements
Jun Pataleta [Wed, 22 Nov 2017 07:28:11 +0000 (20:28 +1300)]
Merge branch 'wip-MDL-60546-master' of git://github.com/abgreeve/moodle
Jun Pataleta [Wed, 22 Nov 2017 04:45:40 +0000 (17:45 +1300)]
Merge branch 'MDL-60813-master' of git://github.com/jleyva/moodle
Jun Pataleta [Wed, 22 Nov 2017 03:54:18 +0000 (16:54 +1300)]
Merge branch 'MDL-60526-master-fix1' of github.com/damyon/moodle
Damyon Wiese [Wed, 22 Nov 2017 03:12:57 +0000 (11:12 +0800)]
MDL-60526 forms: Button elements should have type
The mform "buttons" should be of type "button", instead it's not specified so they get
the default of "submit". This is causing behat fails.
David Monllao [Tue, 21 Nov 2017 10:37:07 +0000 (11:37 +0100)]
Merge branch 'm34_MDL-60745_Bump_ComposerLock_ToPHPUnit_6d4d4' of https://github.com/scara/moodle
David Monllao [Tue, 21 Nov 2017 10:15:42 +0000 (11:15 +0100)]
MDL-59512 version: Following 2 digits scheme
David Monllao [Tue, 21 Nov 2017 10:13:30 +0000 (11:13 +0100)]
Merge branch 'MDL-59512-master' of git://github.com/Dagefoerde/moodle
Jun Pataleta [Tue, 21 Nov 2017 06:03:50 +0000 (19:03 +1300)]
Merge branch 'mdl58817-master' of https://github.com/tlock/moodle
Jun Pataleta [Tue, 21 Nov 2017 03:12:26 +0000 (16:12 +1300)]
Merge branch 'MDL-60637-master' of git://github.com/lameze/moodle
Jake Dallimore [Tue, 21 Nov 2017 00:18:42 +0000 (08:18 +0800)]
Merge branch 'MDL-60796-master' of git://github.com/ankitagarwal/moodle
Jun Pataleta [Mon, 20 Nov 2017 20:52:41 +0000 (09:52 +1300)]
Merge branch 'MDL-60780_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 20 Nov 2017 15:51:43 +0000 (16:51 +0100)]
Merge branch 'MDL-60751-master' of git://github.com/lameze/moodle
Sara Arjona [Fri, 17 Nov 2017 13:33:55 +0000 (14:33 +0100)]
MDL-60830 core_enrol: Added email when searching users in course enrol
Adrian Greeve [Wed, 22 Nov 2017 06:10:55 +0000 (14:10 +0800)]
MDL-60546 mod_choice: Update to select all functionality.
Ryan Wyllie [Wed, 22 Nov 2017 01:27:56 +0000 (01:27 +0000)]
MDL-58887 core: fix default title for action menu
Thanks to Michelle Melton <meltonml@appstate.edu> for the original
version of this patch.
