Damyon Wiese [Tue, 12 Dec 2017 04:49:46 +0000 (12:49 +0800)]
Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/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
Damyon Wiese [Tue, 12 Dec 2017 04:27:12 +0000 (12:27 +0800)]
Merge branch 'master_MDL-60979' of https://github.com/danmarsden/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
Damyon Wiese [Tue, 12 Dec 2017 03:39:20 +0000 (11:39 +0800)]
Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle
Damyon Wiese [Tue, 12 Dec 2017 03:31:16 +0000 (11:31 +0800)]
Merge branch 'MDL-60945' of https://github.com/NeillM/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
Damyon Wiese [Tue, 12 Dec 2017 03:15:03 +0000 (11:15 +0800)]
Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle
Dan Marsden [Wed, 6 Dec 2017 08:26:18 +0000 (21:26 +1300)]
MDL-60979 cohort: allow description to be used in mustache templates.
Damyon Wiese [Tue, 12 Dec 2017 03:08:46 +0000 (11:08 +0800)]
Merge branch 'MDL-60969_master' of git://github.com/markn86/moodle
Andrew Nicols [Tue, 12 Dec 2017 02:56:37 +0000 (10:56 +0800)]
Merge branch 'MDL-60983' of git://github.com/timhunt/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
Damyon Wiese [Tue, 12 Dec 2017 02:26:08 +0000 (10:26 +0800)]
Merge branch 'MDL-44667-master' of https://github.com/snake/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
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
Brendan Heywood [Tue, 5 Dec 2017 06:05:47 +0000 (17:05 +1100)]
MDL-60968 auth: Allow more flexibility with mapping attributes
Damyon Wiese [Tue, 12 Dec 2017 01:13:43 +0000 (09:13 +0800)]
Merge branch 'MDL-60041' of https://github.com/NeillM/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
Mihail Geshoski [Tue, 12 Dec 2017 00:54:51 +0000 (08:54 +0800)]
MDL-52538 lesson: Grade info displayed while ongoing score disabled
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
Damyon Wiese [Mon, 11 Dec 2017 08:47:19 +0000 (16:47 +0800)]
Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle
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.
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.
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
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
Damyon Wiese [Mon, 11 Dec 2017 06:54:46 +0000 (14:54 +0800)]
Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle
Simey Lameze [Tue, 28 Nov 2017 08:10:46 +0000 (16:10 +0800)]
MDL-60057 mod_lesson: add unit tests for 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
Damyon Wiese [Mon, 11 Dec 2017 06:08:08 +0000 (14:08 +0800)]
Merge branch 'MDL-60060-master' of git://github.com/lameze/moodle
Simey Lameze [Tue, 28 Nov 2017 06:47:37 +0000 (14:47 +0800)]
MDL-60060 mod_data: add unit tests for callbacks
Simey Lameze [Tue, 28 Nov 2017 06:14:04 +0000 (14:14 +0800)]
MDL-60060 mod_data: add calendar drag and drop callbacks
Ankit Agarwal [Thu, 30 Nov 2017 08:20:14 +0000 (13:50 +0530)]
MDL-60861 analytics: Remove enable menu, if no timesplitting method
Ankit Agarwal [Thu, 30 Nov 2017 07:55:42 +0000 (13:25 +0530)]
MDL-60861 analytics: Enabling a model requires timesplitting
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
Damyon Wiese [Mon, 11 Dec 2017 04:52:23 +0000 (12:52 +0800)]
Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 4 Dec 2017 02:18:42 +0000 (10:18 +0800)]
MDL-60948 tool_httpsreplace: Correct use of test URLs
Damyon Wiese [Mon, 11 Dec 2017 03:49:40 +0000 (11:49 +0800)]
Merge branch 'MDL-60043' of git://github.com/timhunt/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
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
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
Luca Bösch [Mon, 4 Dec 2017 19:41:34 +0000 (20:41 +0100)]
MDL-60920 quiz: removed legacy "edit questions" button
Luca Bösch [Thu, 7 Dec 2017 15:32:56 +0000 (16:32 +0100)]
MDL-54106 task: Deleting unconfirmed users after $CFG->deleteunconfirmed
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.
Simey Lameze [Fri, 1 Dec 2017 05:04:42 +0000 (13:04 +0800)]
MDL-58058 competency: replace other sortorder usages
Frederic Massart [Thu, 23 Feb 2017 04:10:14 +0000 (12:10 +0800)]
MDL-58058 competency: Allow unspecified sortorder for new competencies
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
Mihail Geshoski [Tue, 5 Dec 2017 02:21:36 +0000 (10:21 +0800)]
MDL-54021 blocks: Course completion block lang problem
Jake Dallimore [Wed, 15 Nov 2017 08:42:18 +0000 (16:42 +0800)]
MDL-58272 core_files: get converters from file extension not mimetype
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.
Jun Pataleta [Thu, 7 Dec 2017 20:09:53 +0000 (09:09 +1300)]
weekly release 3.5dev
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.
Andrew Nicols [Thu, 7 Dec 2017 08:18:28 +0000 (16:18 +0800)]
Merge branch 'MDL-60880-master-fix1' of github.com/damyon/moodle
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
Jun Pataleta [Thu, 7 Dec 2017 04:33:41 +0000 (17:33 +1300)]
Merge branch 'MDL-60951-master' of git://github.com/damyon/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
Andrew Nicols [Wed, 6 Dec 2017 02:04:17 +0000 (10:04 +0800)]
Merge branch 'MDL-59159' of git://github.com/stronk7/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
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
Mark Nelson [Tue, 5 Dec 2017 07:01:19 +0000 (15:01 +0800)]
MDL-60969 auth_ldap: replace hardcoded strings in config settings
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
sam marshall [Wed, 22 Nov 2017 16:47:29 +0000 (16:47 +0000)]
MDL-60880 core_search: Allow search of specific context (front-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).
Luca Bösch [Tue, 28 Nov 2017 21:01:52 +0000 (22:01 +0100)]
MDL-32350 admin: Sort users by country ASC and DESC
Andrew Nicols [Tue, 5 Dec 2017 03:14:40 +0000 (11:14 +0800)]
MDL-60965 behat: Correct strlen use
Jake Dallimore [Mon, 4 Dec 2017 08:53:51 +0000 (16:53 +0800)]
MDL-44667 database: fix incorrect usages of $DB->get_field
Some places were passing 5 params, meaning the strictness param was
lost. This fixes those usages.
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
Eloy Lafuente (stronk7) [Mon, 4 Dec 2017 00:36:57 +0000 (01:36 +0100)]
MDL-59159 upgrade: remove unused functions/settings from upgradelib
All these functions were used only by deleted upgrade steps
so it's safe to proceed with straight deletion, considering
them internal. Deletion has been documented in corresponding
upgrade.txt files:
- mod_feedback_upgrade_delete_duplicate_values()
- mod_feedback_upgrade_courseid()
These have been kept because they continue being used:
- @ install: make_competence_scale()
- @ restore: upgrade_course_letter_boundary()
Eloy Lafuente (stronk7) [Mon, 4 Dec 2017 00:16:11 +0000 (01:16 +0100)]
MDL-59159 upgrade: clean < 3.1.0 upgrade steps
LTS (3.5) requires previous LTS (3.1)
This just deletes all the upgrade steps previous to 3.1.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.
Also includes an upgrade step to prevent upgrading from any
version <
2016052300 (v3.1.0) as anti-cheating measure.
Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
Jun Pataleta [Sun, 3 Dec 2017 23:50:06 +0000 (12:50 +1300)]
Merge branch 'MDL-60914_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Sun, 3 Dec 2017 23:27:53 +0000 (00:27 +0100)]
MDL-59159 environment: 3.1 (LTS) required
Eloy Lafuente (stronk7) [Sun, 3 Dec 2017 23:23:28 +0000 (00:23 +0100)]
MDL-59159 environment: 3.5 base information
This is a direct copy of the 3.4 branch to
have changes under control easier in next commits.
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.
Marina Glancy [Thu, 30 Nov 2017 03:27:41 +0000 (11:27 +0800)]
MDL-31436 hub: never use xmlrpc, always use REST
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'