87482 Commits

Author SHA1 Message Date
Damyon Wiese
97812f14c1 Merge branch 'MDL-60880-master' of https://github.com/sammarshallou/moodle 2017-12-06 19:53:37 +13:00
Andrew Nicols
e3b699eab7 Merge branch 'MDL-59159' of git://github.com/stronk7/moodle 2017-12-06 19:53:36 +13:00
Jun Pataleta
b908c1add2 Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle 2017-12-06 19:53:35 +13:00
Jun Pataleta
1396cb6346 Merge branch 'wip-MDL-60926-master' of git://github.com/marinaglancy/moodle 2017-12-06 19:53:35 +13:00
Damyon Wiese
bfb5d3ba26 Merge branch 'MDL-37933_master' of git://github.com/markn86/moodle 2017-12-06 19:53:34 +13:00
David Herney
d52e5dd32d 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.
2017-12-06 19:53:34 +13:00
Jun Pataleta
f013112752 Merge branch 'wip-MDL-34161-master' of git://github.com/marinaglancy/moodle 2017-12-06 19:53:33 +13:00
Andrew Nicols
adbe17ec68 Merge branch 'MDL-60801' of https://github.com/andrewhancox/moodle 2017-12-06 19:53:32 +13:00
Andrew Nicols
9501b1eb76 Merge branch 'MDL-60857-master' of https://github.com/sammarshallou/moodle 2017-12-06 19:53:32 +13:00
Andrew Nicols
0ea7278f64 Merge branch 'MDL-60899-master' of git://github.com/damyon/moodle 2017-12-06 19:53:31 +13:00
Damyon Wiese
a569a33097 Merge branch 'MDL-59875_m35v1' of https://github.com/sbourget/moodle 2017-12-06 19:53:31 +13:00
Jun Pataleta
1b98e553a7 Merge branch 'MDL-36056-master-fix1' of http://github.com/damyon/moodle 2017-12-06 19:53:31 +13:00
Andrew Nicols
9e51dc406f Merge branch 'MDL-47114-master' of git://github.com/rezaies/moodle 2017-12-06 19:53:30 +13:00
Damyon Wiese
387f7aae0d 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.
2017-12-06 19:53:30 +13:00
Andrew Nicols
ebe2fafa8b Merge branch 'wip-MDL-37757-master' of git://github.com/abgreeve/moodle 2017-12-06 19:53:29 +13:00
Mark Nelson
dbe18cd356 MDL-60969 auth_ldap: replace hardcoded strings in config settings 2017-12-06 11:25:35 +08:00
Damyon Wiese
3715c59ef9 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
2017-12-06 10:59:54 +08:00
David Mudrák
a3d003603a 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.
2017-12-05 22:58:51 +01:00
Daniel Thee Roperto
ee2187273f 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.
2017-12-05 22:01:18 +01:00
sam marshall
7f9fb2c846 MDL-60880 core_search: Allow search of specific context (front-end) 2017-12-05 17:42:40 +00:00
sam marshall
cfa00fc565 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).
2017-12-05 17:42:38 +00:00
Luca Bösch
fc07f6adbc MDL-32350 admin: Sort users by country ASC and DESC 2017-12-05 07:21:29 +01:00
Andrew Nicols
a7d75ba5c8 MDL-60965 behat: Correct strlen use 2017-12-05 11:18:58 +08:00
Jake Dallimore
3112c22004 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.
2017-12-04 16:53:51 +08:00
Damyon Wiese
713a2cbb25 Merge branch 'MDL-60219-master' of https://github.com/abias/moodle 2017-12-04 16:28:16 +08:00
Damyon Wiese
b0c4f9c21c Merge branch 'MDL-36056-master-enrolkeywhitespace' of git://github.com/mudrd8mz/moodle 2017-12-04 16:00:19 +08:00
Marina Glancy
05cd2ff627 MDL-34161 mod_lti: backup and restore of submissions 2017-12-04 15:05:00 +08:00
Marina Glancy
6489a3d455 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.
2017-12-04 15:04:56 +08:00
Tim Lock
edbcee25c1 MDL-34161 mod_lti: Added Behat tests 2017-12-04 15:03:44 +08:00
Gregory Faller
387a3a208a MDL-34161 mod_lti: Add support for restoring site tool 2017-12-04 15:03:44 +08:00
Jun Pataleta
d8c1a57b99 Merge branch 'wip-MDL-60887-master' of git://github.com/marinaglancy/moodle 2017-12-04 18:24:15 +13:00
Jun Pataleta
bea5a16203 Merge branch 'MDL-60925-master' of git://github.com/damyon/moodle 2017-12-04 14:32:26 +13:00
Marina Glancy
65a77c7381 MDL-60926 auth: do not map very long profile fields 2017-12-04 09:31:42 +08:00
Eloy Lafuente (stronk7)
7ec475e2d7 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()
2017-12-04 01:42:01 +01:00
Eloy Lafuente (stronk7)
e4eba4c346 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.
2017-12-04 01:18:57 +01:00
Jun Pataleta
c1cd2924ec Merge branch 'MDL-60914_master' of git://github.com/markn86/moodle 2017-12-04 12:50:06 +13:00
Eloy Lafuente (stronk7)
4111611710 MDL-59159 environment: 3.1 (LTS) required 2017-12-04 00:27:53 +01:00
Eloy Lafuente (stronk7)
f0781f34c9 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.
2017-12-04 00:25:48 +01:00
Shamim Rezaie
8c42eef35c MDL-47114 core: Improved function description 2017-12-02 07:44:35 +08:00
sam marshall
1b8cf12a59 MDL-60857 core_search: Improve cron log progress information 2017-12-01 15:47:22 +00:00
Ryan Wyllie
748545858c MDL-60942 filters: include filter in format_string cache key 2017-12-01 06:49:24 +00:00
Eloy Lafuente (stronk7)
5f54a8760f weekly release 3.5dev 2017-11-30 17:05:14 +01:00
David Mudrák
0c6554e03c MDL-36056 form: Do not allow passwords with wrapping whitespace
This is to avoid accidental misconfiguration while copy/pasting the
password value.
2017-11-30 10:47:57 +01:00
Marina Glancy
efe4210395 MDL-31436 hub: never use xmlrpc, always use REST 2017-11-30 11:28:00 +08:00
Damyon Wiese
b3480499c6 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.
2017-11-29 17:01:07 +08:00
Alexander Bias
ee73ec3d3c MDL-60219 lti: Replace pagelayout frametop with incourse 2017-11-29 09:54:42 +01:00
Damyon Wiese
81a989e6d8 MDL-58200 competencies: Student can view linked courses 2017-11-29 16:07:07 +08:00
Damyon Wiese
1e1bc82294 Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle 2017-11-29 12:18:21 +08:00
Jun Pataleta
1577c5ea20 Merge branch 'wip-MDL-45068-master-fix' of https://github.com/marinaglancy/moodle 2017-11-29 16:59:25 +13:00
Marina Glancy
b955ad6a55 MDL-45068 groups: corrected check for idnumber '0' 2017-11-29 11:50:44 +08:00