moodle.git
3 years agoMerge branch 'MDL-57431-master' of git://github.com/lameze/moodle
Damyon Wiese [Mon, 18 Dec 2017 04:51:33 +0000 (12:51 +0800)]
Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle
Damyon Wiese [Mon, 18 Dec 2017 04:43:50 +0000 (12:43 +0800)]
Merge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle

3 years agoMerge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 18 Dec 2017 03:35:29 +0000 (11:35 +0800)]
Merge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'MDL-57564-master-courseorder' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Mon, 18 Dec 2017 03:04:20 +0000 (11:04 +0800)]
Merge branch 'MDL-57564-master-courseorder' of git://github.com/mudrd8mz/moodle

3 years agoMDL-54967 backup: Fix IMS CC import URL decoding for XML format
Zig Tan [Fri, 15 Dec 2017 01:19:26 +0000 (09:19 +0800)]
MDL-54967 backup: Fix IMS CC import URL decoding for XML format

HTML encoding special characters to avoid XML compatibility issues during
Course backup restoration and avoid double encoding.

3 years agoweekly release 3.5dev
Eloy Lafuente (stronk7) [Thu, 14 Dec 2017 13:47:29 +0000 (14:47 +0100)]
weekly release 3.5dev

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 14 Dec 2017 13:47:27 +0000 (14:47 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoAutomatically generated installer lang files
AMOS bot [Thu, 14 Dec 2017 00:06:01 +0000 (00:06 +0000)]
Automatically generated installer lang files

3 years agoMDL-31436 registration: do not send false in update request
Marina Glancy [Wed, 13 Dec 2017 04:36:57 +0000 (12:36 +0800)]
MDL-31436 registration: do not send false in update request

3 years agoMerge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle
Damyon Wiese [Wed, 13 Dec 2017 03:30:46 +0000 (11:30 +0800)]
Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle

3 years agoMDL-60964 calendar: lazy load context for calendar_event
Ryan Wyllie [Fri, 24 Nov 2017 06:33:41 +0000 (06:33 +0000)]
MDL-60964 calendar: lazy load context for calendar_event

Stop loading the context in the constructor if it hasn't been provided.
There is no need to load it by default. We should lazily load it when it
is required.

3 years agoMerge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Tue, 12 Dec 2017 07:14:03 +0000 (20:14 +1300)]
Merge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-58200-master' of git://github.com/damyon/moodle
Jun Pataleta [Tue, 12 Dec 2017 06:13:32 +0000 (19:13 +1300)]
Merge branch 'MDL-58200-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-59970-master' of git://github.com/damyon/moodle
Jun Pataleta [Tue, 12 Dec 2017 05:52:49 +0000 (18:52 +1300)]
Merge branch 'MDL-59970-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-59866' of https://github.com/marcusboon/moodle
Andrew Nicols [Tue, 12 Dec 2017 05:46:07 +0000 (13:46 +0800)]
Merge branch 'MDL-59866' of https://github.com/marcusboon/moodle

3 years agoMerge branch 'wip-MDL-56864-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 12 Dec 2017 05:36:32 +0000 (13:36 +0800)]
Merge branch 'wip-MDL-56864-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'MDL-59438-master' of git://github.com/rezaies/moodle
Damyon Wiese [Tue, 12 Dec 2017 04:56:19 +0000 (12:56 +0800)]
Merge branch 'MDL-59438-master' of git://github.com/rezaies/moodle

3 years agoMerge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle
Damyon Wiese [Tue, 12 Dec 2017 04:49:46 +0000 (12:49 +0800)]
Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle

3 years agoMDL-59866 session: Add retry for redis sessions
Marcus Boon [Thu, 13 Jul 2017 04:44:29 +0000 (14:44 +1000)]
MDL-59866 session: Add retry for redis sessions

There is an edge case whereby redis will fail
to accept connections on the first try but
retrying the connection seems to make it work

Included in this commit:
* Retry functionality in the session init

3 years agoMerge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 12 Dec 2017 04:38:11 +0000 (12:38 +0800)]
Merge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle

3 years agoMerge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle
Damyon Wiese [Tue, 12 Dec 2017 04:27:12 +0000 (12:27 +0800)]
Merge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle

3 years agoMerge branch 'MDL-58058-master' of git://github.com/lameze/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:59:50 +0000 (11:59 +0800)]
Merge branch 'MDL-58058-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:39:20 +0000 (11:39 +0800)]
Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'MDL-60945' of https://github.com/NeillM/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:31:16 +0000 (11:31 +0800)]
Merge branch 'MDL-60945' of https://github.com/NeillM/moodle

3 years agoMerge branch 'MDL-59766-master' of git://github.com/damyon/moodle
Jun Pataleta [Tue, 12 Dec 2017 03:26:34 +0000 (16:26 +1300)]
Merge branch 'MDL-59766-master' of git://github.com/damyon/moodle

3 years agoMerge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:15:03 +0000 (11:15 +0800)]
Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60979 cohort: allow description to be used in mustache templates.
Dan Marsden [Wed, 6 Dec 2017 08:26:18 +0000 (21:26 +1300)]
MDL-60979 cohort: allow description to be used in mustache templates.

3 years agoMerge branch 'MDL-60969_master' of git://github.com/markn86/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:08:46 +0000 (11:08 +0800)]
Merge branch 'MDL-60969_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-60983' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 12 Dec 2017 02:56:37 +0000 (10:56 +0800)]
Merge branch 'MDL-60983' of git://github.com/timhunt/moodle

3 years agoMerge branch 'MDL-52538-master' of git://github.com/mihailges/moodle
Damyon Wiese [Tue, 12 Dec 2017 02:40:15 +0000 (10:40 +0800)]
Merge branch 'MDL-52538-master' of git://github.com/mihailges/moodle

3 years agoMerge branch 'MDL-44667-master' of https://github.com/snake/moodle
Damyon Wiese [Tue, 12 Dec 2017 02:26:08 +0000 (10:26 +0800)]
Merge branch 'MDL-44667-master' of https://github.com/snake/moodle

3 years agoMerge branch 'MDL-60968-master' of git://github.com/lameze/moodle
Damyon Wiese [Tue, 12 Dec 2017 02:19:00 +0000 (10:19 +0800)]
Merge branch 'MDL-60968-master' of git://github.com/lameze/moodle

3 years agoMerge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle
Damyon Wiese [Tue, 12 Dec 2017 01:56:20 +0000 (09:56 +0800)]
Merge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle

3 years agoMDL-57431 mod_quiz: Quiz editing help icon fix
Mathew May [Mon, 2 Oct 2017 22:05:25 +0000 (11:05 +1300)]
MDL-57431 mod_quiz: Quiz editing help icon fix

3 years agoMDL-60968 auth: Allow more flexibility with mapping attributes
Brendan Heywood [Tue, 5 Dec 2017 06:05:47 +0000 (17:05 +1100)]
MDL-60968 auth: Allow more flexibility with mapping attributes

3 years agoMerge branch 'MDL-60041' of https://github.com/NeillM/moodle
Damyon Wiese [Tue, 12 Dec 2017 01:13:43 +0000 (09:13 +0800)]
Merge branch 'MDL-60041' of https://github.com/NeillM/moodle

3 years agoMerge branch 'MDL-54021-master' of git://github.com/mihailges/moodle
Damyon Wiese [Tue, 12 Dec 2017 00:55:57 +0000 (08:55 +0800)]
Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle

3 years agoMDL-52538 lesson: Grade info displayed while ongoing score disabled
Mihail Geshoski [Tue, 12 Dec 2017 00:54:51 +0000 (08:54 +0800)]
MDL-52538 lesson: Grade info displayed while ongoing score disabled

3 years agoMDL-60759 search_solr: Solr 7+ compatibility
David Monllao [Fri, 17 Nov 2017 11:10:06 +0000 (12:10 +0100)]
MDL-60759 search_solr: Solr 7+ compatibility

3 years agoMerge branch 'MDL-40790-master' of git://github.com/mihailges/moodle
Damyon Wiese [Mon, 11 Dec 2017 08:55:27 +0000 (16:55 +0800)]
Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle

Conflicts:
theme/boost/scss/moodle/modules.scss

3 years agoMerge branch 'MDL-56197-master' of git://github.com/mihailges/moodle
Damyon Wiese [Mon, 11 Dec 2017 08:47:19 +0000 (16:47 +0800)]
Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle

3 years agoMDL-60945 Web services: Too many progress records retrieved
Neill Magill [Fri, 1 Dec 2017 14:42:37 +0000 (14:42 +0000)]
MDL-60945 Web services: Too many progress records retrieved

The core_completion_get_activities_completion_status was getting the
progress for all users on the course called, and then discarding all
the records but one.

This change ensures that only progress for the user we are interested in
is retrieved from the database.

This has a side benefit of removing a full table scan from the query
finding the users inside the get_progress_all() method.

3 years agoMDL-60041 dml: MOODLELIB sql file must have Unix line endings
Neill Magill [Wed, 6 Sep 2017 14:04:39 +0000 (15:04 +0100)]
MDL-60041 dml: MOODLELIB sql file must have Unix line endings

If the file does not have Unix line endings then the regular expression
in oci_native_moodle_database::attempt_oci_package_install() does
not split it correctly.

This leads to an invalid package being created in Oracle.

The .gitattribute file changes for oci_native_moodle_package.sql
force it to have Unix style line endings when the branch is checked
out and the file does not already exist.

The file has been modified so that the Unix style line endings are
applied even if the file already exists, for example when pulling in
this change to an existing branch.

3 years agoMDL-56197 lesson: Multichoice answers not on same line as radio button
Mihail Geshoski [Mon, 11 Dec 2017 07:49:24 +0000 (15:49 +0800)]
MDL-56197 lesson: Multichoice answers not on same line as radio button

3 years agoMerge branch 'MDL-58272-master-2' of https://github.com/snake/moodle
Andrew Nicols [Mon, 11 Dec 2017 06:58:14 +0000 (14:58 +0800)]
Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle

3 years agoMerge branch 'MDL-60057-master' of git://github.com/lameze/moodle
Damyon Wiese [Mon, 11 Dec 2017 06:54:46 +0000 (14:54 +0800)]
Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle

3 years agoMDL-60057 mod_lesson: add unit tests for callbacks
Simey Lameze [Tue, 28 Nov 2017 08:10:46 +0000 (16:10 +0800)]
MDL-60057 mod_lesson: add unit tests for callbacks

3 years agoMDL-60057 mod_lesson: add calendar drag and drop callbacks
Simey Lameze [Tue, 28 Nov 2017 08:00:58 +0000 (16:00 +0800)]
MDL-60057 mod_lesson: add calendar drag and drop callbacks

AMOS BEGIN
        CPY [openafterclose,mod_choice],[openafterclose,mod_lesson]
CPY [closebeforeopen,mod_choice],[closebeforeopen,mod_database]
CPY [openafterclose,mod_choice],[openafterclose,mod_database]
AMOS END

3 years agoMerge branch 'MDL-60060-master' of git://github.com/lameze/moodle
Damyon Wiese [Mon, 11 Dec 2017 06:08:08 +0000 (14:08 +0800)]
Merge branch 'MDL-60060-master' of git://github.com/lameze/moodle

3 years agoMDL-60060 mod_data: add unit tests for callbacks
Simey Lameze [Tue, 28 Nov 2017 06:47:37 +0000 (14:47 +0800)]
MDL-60060 mod_data: add unit tests for callbacks

3 years agoMDL-60060 mod_data: add calendar drag and drop callbacks
Simey Lameze [Tue, 28 Nov 2017 06:14:04 +0000 (14:14 +0800)]
MDL-60060 mod_data: add calendar drag and drop callbacks

3 years agoMDL-60861 analytics: Remove enable menu, if no timesplitting method
Ankit Agarwal [Thu, 30 Nov 2017 08:20:14 +0000 (13:50 +0530)]
MDL-60861 analytics: Remove enable menu,  if no timesplitting method

3 years agoMDL-60861 analytics: Enabling a model requires timesplitting
Ankit Agarwal [Thu, 30 Nov 2017 07:55:42 +0000 (13:25 +0530)]
MDL-60861 analytics: Enabling a model requires timesplitting

3 years agoMerge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 11 Dec 2017 04:56:18 +0000 (12:56 +0800)]
Merge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle

3 years agoMDL-59438 calendar: Added a foreign key and an index
Shamim Rezaie [Tue, 5 Dec 2017 10:21:54 +0000 (18:21 +0800)]
MDL-59438 calendar: Added a foreign key and an index

Added foreign key constraint to the event.subscriptionid column.
Also added index to the event.uuid column.

3 years agoMerge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 11 Dec 2017 04:52:23 +0000 (12:52 +0800)]
Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60948 tool_httpsreplace: Correct use of test URLs
Andrew Nicols [Mon, 4 Dec 2017 02:18:42 +0000 (10:18 +0800)]
MDL-60948 tool_httpsreplace: Correct use of test URLs

3 years agoMerge branch 'MDL-60043' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 11 Dec 2017 03:49:40 +0000 (11:49 +0800)]
Merge branch 'MDL-60043' of git://github.com/timhunt/moodle

3 years agoMerge branch 'MDL-54106-master' of https://github.com/lucaboesch/moodle
Damyon Wiese [Mon, 11 Dec 2017 03:37:48 +0000 (11:37 +0800)]
Merge branch 'MDL-54106-master' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'wip-MDL-31436-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 11 Dec 2017 03:27:28 +0000 (11:27 +0800)]
Merge branch 'wip-MDL-31436-master' of git://github.com/marinaglancy/moodle

3 years agoMDL-44660 grade: Typos @package core_grade instead of core_grades
Luca Bösch [Mon, 4 Dec 2017 07:47:42 +0000 (08:47 +0100)]
MDL-44660 grade: Typos @package core_grade instead of core_grades

3 years agoMDL-60920 quiz: removed legacy "edit questions" button
Luca Bösch [Mon, 4 Dec 2017 19:41:34 +0000 (20:41 +0100)]
MDL-60920 quiz: removed legacy "edit questions" button

3 years agoMDL-54106 task: Deleting unconfirmed users after $CFG->deleteunconfirmed
Luca Bösch [Thu, 7 Dec 2017 15:32:56 +0000 (16:32 +0100)]
MDL-54106 task: Deleting unconfirmed users after $CFG->deleteunconfirmed

3 years agoMDL-60043 accesslib: improve query performance by removing ORDER BY
Tomek Muras [Wed, 6 Sep 2017 14:59:12 +0000 (16:59 +0200)]
MDL-60043 accesslib: improve query performance by removing ORDER BY

then add back the minimal necessary sorting in PHP. That part was
added by Tim Hunt.

3 years agoMDL-58058 competency: replace other sortorder usages
Simey Lameze [Fri, 1 Dec 2017 05:04:42 +0000 (13:04 +0800)]
MDL-58058 competency: replace other sortorder usages

3 years agoMDL-58058 competency: Allow unspecified sortorder for new competencies
Frederic Massart [Thu, 23 Feb 2017 04:10:14 +0000 (12:10 +0800)]
MDL-58058 competency: Allow unspecified sortorder for new competencies

3 years agoMDL-40790 lesson: Lesson content button runs off the edge of the page
Mihail Geshoski [Thu, 30 Nov 2017 05:31:10 +0000 (13:31 +0800)]
MDL-40790 lesson: Lesson content button runs off the edge of the page

3 years agoMDL-54021 blocks: Course completion block lang problem
Mihail Geshoski [Tue, 5 Dec 2017 02:21:36 +0000 (10:21 +0800)]
MDL-54021 blocks: Course completion block lang problem

3 years agoMDL-58272 core_files: get converters from file extension not mimetype
Jake Dallimore [Wed, 15 Nov 2017 08:42:18 +0000 (16:42 +0800)]
MDL-58272 core_files: get converters from file extension not mimetype

3 years agoAutomatically generated installer lang files
AMOS bot [Fri, 8 Dec 2017 00:09:38 +0000 (00:09 +0000)]
Automatically generated installer lang files

3 years agoMDL-60976 dml: Optimise replace_all_text()
Matt Clarkson [Tue, 5 Dec 2017 21:41:01 +0000 (10:41 +1300)]
MDL-60976 dml: Optimise replace_all_text()

Avoid updating fields that do not match the search string.

3 years agoweekly release 3.5dev
Jun Pataleta [Thu, 7 Dec 2017 20:09:53 +0000 (09:09 +1300)]
weekly release 3.5dev

3 years agoMDL-60983 get_user_capability_course: fix buggy edge cases
Tim Hunt [Wed, 6 Dec 2017 19:40:38 +0000 (19:40 +0000)]
MDL-60983 get_user_capability_course: fix buggy edge cases

There were basically two problems, which are demostrated by
the new test users u7 and u8 in the unit test.

1. There was a problem if a role was overridden in a context above the
one where it was assigned. E.g. User has teacher role in a course, and
there is a role override in the course-category context. That was being
ignored.

2. Problems with the handling of PROHIBITs. It should be the case that
if there is a PROHIBIT in force, then it cannot be overridden by another
role, or by a role override. However, this was not working in all cases.

Also, I had to add comments to the unit test so that I could understand
it. Hopefully these will be hepful to other developers too.

3 years agoMerge branch 'MDL-60880-master-fix1' of http://github.com/damyon/moodle
Andrew Nicols [Thu, 7 Dec 2017 08:18:28 +0000 (16:18 +0800)]
Merge branch 'MDL-60880-master-fix1' of github.com/damyon/moodle

3 years agoMDL-60880 core_search: Behat fix for clean theme
Damyon Wiese [Thu, 7 Dec 2017 07:50:41 +0000 (15:50 +0800)]
MDL-60880 core_search: Behat fix for clean theme

The navigation block is visible in clean so "I should not see courses" finds the link in the navigation block

3 years agoMerge branch 'MDL-60951-master' of git://github.com/damyon/moodle
Jun Pataleta [Thu, 7 Dec 2017 04:33:41 +0000 (17:33 +1300)]
Merge branch 'MDL-60951-master' of git://github.com/damyon/moodle

3 years agoMDL-57564 enrol: Fix typos and copy&paste mistake in the exception msg
David Mudrák [Tue, 5 Dec 2017 20:59:04 +0000 (21:59 +0100)]
MDL-57564 enrol: Fix typos and copy&paste mistake in the exception msg

3 years agoMDL-57564 enrol: Make use of the new default sort parameter
David Mudrák [Tue, 5 Dec 2017 20:56:07 +0000 (21:56 +0100)]
MDL-57564 enrol: Make use of the new default sort parameter

Now when enrol_get_my_courses(), enrol_get_users_courses() and
enrol_get_all_users_courses() methods automatically reflect the
navsortmycoursessort setting by default, we do not need to manually
compose the sorting any more.

3 years agoMDL-57564 enrol: Add unit tests for the new sorting behaviour
David Mudrák [Wed, 6 Dec 2017 22:14:08 +0000 (23:14 +0100)]
MDL-57564 enrol: Add unit tests for the new sorting behaviour

3 years agoMerge branch 'MDL-60880-master' of https://github.com/sammarshallou/moodle
Damyon Wiese [Wed, 6 Dec 2017 02:07:58 +0000 (10:07 +0800)]
Merge branch 'MDL-60880-master' of https://github.com/sammarshallou/moodle

3 years agoMerge branch 'MDL-59159' of git://github.com/stronk7/moodle
Andrew Nicols [Wed, 6 Dec 2017 02:04:17 +0000 (10:04 +0800)]
Merge branch 'MDL-59159' of git://github.com/stronk7/moodle

3 years agoMerge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle
Jun Pataleta [Tue, 5 Dec 2017 22:31:16 +0000 (11:31 +1300)]
Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle

3 years agoMerge branch 'wip-MDL-60926-master' of git://github.com/marinaglancy/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

3 years agoMerge branch 'MDL-37933_master' of git://github.com/markn86/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

3 years agoMDL-60443 dataformat lib: Change a wrong variable name
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.

3 years agoMerge branch 'wip-MDL-34161-master' of git://github.com/marinaglancy/moodle
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

3 years agoMerge branch 'MDL-60801' of https://github.com/andrewhancox/moodle
Andrew Nicols [Tue, 5 Dec 2017 04:48:52 +0000 (12:48 +0800)]
Merge branch 'MDL-60801' of https://github.com/andrewhancox/moodle

3 years agoMerge branch 'MDL-60857-master' of https://github.com/sammarshallou/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

3 years agoMerge branch 'MDL-60899-master' of git://github.com/damyon/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

3 years agoMerge branch 'MDL-59875_m35v1' of https://github.com/sbourget/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

3 years agoMerge branch 'MDL-36056-master-fix1' of http://github.com/damyon/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

3 years agoMerge branch 'MDL-47114-master' of git://github.com/rezaies/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

3 years agoMDL-36056 forms: Don't validate disabled fields
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.

3 years agoMerge branch 'wip-MDL-37757-master' of git://github.com/abgreeve/moodle
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

3 years agoMDL-60969 auth_ldap: replace hardcoded strings in config settings
Mark Nelson [Tue, 5 Dec 2017 07:01:19 +0000 (15:01 +0800)]
MDL-60969 auth_ldap: replace hardcoded strings in config settings

3 years agoMDL-60951 travis: Disable redis on travis
Damyon Wiese [Wed, 6 Dec 2017 02:53:32 +0000 (10:53 +0800)]
MDL-60951 travis: Disable redis on travis

Redis unit tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628

3 years agoMDL-57564 enrol: Change the default sort in other two functions
David Mudrák [Tue, 5 Dec 2017 20:53:55 +0000 (21:53 +0100)]
MDL-57564 enrol: Change the default sort in other two functions

Similarly to what the previous patch does, we now change the default
sorting in functions enrol_get_users_courses() and
enrol_get_all_users_courses() too.

The patch also adds missing phpDocs for the functions, improves the
readability of some existing bits and mentions the changes in the
enrol/upgrade.txt file.

3 years agoMDL-57564 enrol: Change the default sort in enrol_get_my_courses()
Daniel Thee Roperto [Wed, 22 Nov 2017 05:13:03 +0000 (16:13 +1100)]
MDL-57564 enrol: Change the default sort in enrol_get_my_courses()

The new default value (null) now respects the navsortmycoursessort
behaviour and should be consistently used whenever we are displaying the
courses in the UI.

3 years agoMDL-60880 core_search: Allow search of specific context (front-end)
sam marshall [Wed, 22 Nov 2017 16:47:29 +0000 (16:47 +0000)]
MDL-60880 core_search: Allow search of specific context (front-end)

3 years agoMDL-60880 core_search: Allow search of specific context (back-end)
sam marshall [Wed, 22 Nov 2017 14:31:32 +0000 (14:31 +0000)]
MDL-60880 core_search: Allow search of specific context (back-end)

Adds back-end support for restricting searches to specified context
ids (for example so it is possible to search only a specific forum).