mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 18:12:29 +01:00
Code Issues Projects Releases Wiki Activity
87,343 Commits 36 Branches 527 Tags
Commit Graph

87343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
917923c860 Merge branch 'MDL-60043' of git://github.com/timhunt/moodle 2017-12-11 11:49:40 +08:00
Damyon Wiese
5ec2ce20f5 Merge branch 'MDL-54106-master' of https://github.com/lucaboesch/moodle 2017-12-11 11:37:48 +08:00
Damyon Wiese
e82c025e60 Merge branch 'wip-MDL-31436-master' of git://github.com/marinaglancy/moodle 2017-12-11 11:27:28 +08:00
Luca Bösch
970dc511e2 MDL-44660 grade: Typos @package core_grade instead of core_grades 2017-12-08 14:21:34 +01:00
Luca Bösch
41d335f31a MDL-60920 quiz: removed legacy "edit questions" button 2017-12-08 14:13:05 +01:00
Luca Bösch
7f8773ffb8 MDL-54106 task: Deleting unconfirmed users after $CFG->deleteunconfirmed 2017-12-08 14:12:57 +01:00
Tomek Muras
aceb84ad76 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.
 2017-12-08 12:08:44 +00:00
Simey Lameze
f9bb74c037 MDL-58058 competency: replace other sortorder usages 2017-12-08 15:58:52 +08:00
Frederic Massart
f250cdbb34 MDL-58058 competency: Allow unspecified sortorder for new competencies 2017-12-08 15:58:52 +08:00
Mihail Geshoski
473391b667 MDL-40790 lesson: Lesson content button runs off the edge of the page 2017-12-08 09:55:36 +08:00
Mihail Geshoski
d381732329 MDL-54021 blocks: Course completion block lang problem 2017-12-08 09:24:03 +08:00
Jake Dallimore
46878ed87f MDL-58272 core_files: get converters from file extension not mimetype 2017-12-08 09:07:29 +08:00
AMOS bot
f1ae118df3 Automatically generated installer lang files 2017-12-08 00:09:38 +00:00
Matt Clarkson
1c06098b6b MDL-60976 dml: Optimise replace_all_text() 
Avoid updating fields that do not match the search string.
 2017-12-08 12:35:56 +13:00
Jun Pataleta
109aa07648 weekly release 3.5dev 2017-12-08 09:09:53 +13:00
Tim Hunt
91c8d8b130 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.
 2017-12-07 18:28:18 +00:00
Andrew Nicols
f017a30ff3 Merge branch 'MDL-60880-master-fix1' of http://github.com/damyon/moodle 2017-12-07 16:18:28 +08:00
Damyon Wiese
6f7daa5e48 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
 2017-12-07 15:54:03 +08:00
Jun Pataleta
4ffbf22046 Merge branch 'MDL-60951-master' of git://github.com/damyon/moodle 2017-12-07 17:33:41 +13:00
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
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