mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 08:52:46 +02:00
Code Issues Projects Releases Wiki Activity
87,363 Commits 36 Branches 529 Tags
Commit Graph

87363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
b91696eeac Merge branch 'MDL-42676-master' of git://github.com/zig-moodle/moodle 2017-12-18 15:08:37 +08:00
Andrew Nicols
6cb535f081 Merge branch 'MDL-60061-master' of git://github.com/lameze/moodle 2017-12-18 14:03:47 +08:00
Damyon Wiese
dcb623be71 Merge branch 'MDL-34389-subcategories-for-category-changer' of https://github.com/lucaboesch/moodle 2017-12-18 12:56:58 +08:00
Damyon Wiese
2d08e6565a Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle 2017-12-18 12:51:33 +08:00
Damyon Wiese
e95db3416c Merge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle 2017-12-18 12:43:50 +08:00
Damyon Wiese
8c2a7f9c38 Merge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle 2017-12-18 11:35:29 +08:00
Andrew Nicols
560ae357a0 Merge branch 'MDL-57564-master-courseorder' of git://github.com/mudrd8mz/moodle 2017-12-18 11:04:20 +08:00
Zig Tan
e0d0f411cf 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.
 2017-12-15 09:19:31 +08:00
Luca Bösch
f987df174f MDL-34389 course: switch to subcategory w/ course:changecategory perms 2017-12-14 22:32:23 +01:00
Eloy Lafuente (stronk7)
95b7be7f05 weekly release 3.5dev 2017-12-14 14:47:29 +01:00
Eloy Lafuente (stronk7)
10e52ed009 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-12-14 14:47:27 +01:00
AMOS bot
ebb250fefb Automatically generated installer lang files 2017-12-14 00:06:01 +00:00
Marina Glancy
10c71d8a2f MDL-31436 registration: do not send false in update request 2017-12-13 13:51:25 +08:00
Damyon Wiese
23611c3757 Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle 2017-12-13 11:30:46 +08:00
Ryan Wyllie
08a7915551 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.
 2017-12-13 03:20:00 +00:00
Simey Lameze
cadeb8d21c MDL-60061 mod_scorm: add unit tests for drag/drop 2017-12-12 15:15:09 +08:00
Simey Lameze
f808e0432a MDL-60061 mod_scorm: add support for drag/drop events 
AMOS BEGIN
	CPY [openafterclose,mod_choice],[openafterclose,mod_scorm]
AMOS END
 2017-12-12 15:15:09 +08:00
Jun Pataleta
4ea790da9b Merge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle 2017-12-12 20:14:03 +13:00
Jun Pataleta
29c4106e2f Merge branch 'MDL-58200-master' of git://github.com/damyon/moodle 2017-12-12 19:13:32 +13:00
Jun Pataleta
24131d08c0 Merge branch 'MDL-59970-master' of git://github.com/damyon/moodle 2017-12-12 18:52:49 +13:00
Andrew Nicols
6d326b17d8 Merge branch 'MDL-59866' of https://github.com/marcusboon/moodle 2017-12-12 13:46:07 +08:00
Andrew Nicols
2f920d9be8 Merge branch 'wip-MDL-56864-master' of git://github.com/marinaglancy/moodle 2017-12-12 13:36:32 +08:00
Damyon Wiese
8cdfa8692b Merge branch 'MDL-59438-master' of git://github.com/rezaies/moodle 2017-12-12 13:05:22 +08:00
Damyon Wiese
a34a305d53 Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle 2017-12-12 12:49:46 +08:00
Marcus Boon
f8e2383bdd 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
 2017-12-12 14:42:04 +10:00
Damyon Wiese
a576da555e Merge branch 'MDL-60861-master' of git://github.com/ankitagarwal/moodle 2017-12-12 12:38:11 +08:00
Damyon Wiese
233c91e7d0 Merge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle 2017-12-12 12:27:12 +08:00
Damyon Wiese
59be445c15 Merge branch 'MDL-58058-master' of git://github.com/lameze/moodle 2017-12-12 11:59:50 +08:00
Damyon Wiese
302104af4b Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle 2017-12-12 11:39:20 +08:00
Damyon Wiese
80b6f3b059 Merge branch 'MDL-60945' of https://github.com/NeillM/moodle 2017-12-12 11:31:16 +08:00
Jun Pataleta
9244faa3a4 Merge branch 'MDL-59766-master' of git://github.com/damyon/moodle 2017-12-12 16:26:34 +13:00
Damyon Wiese
6b58bb56cb Merge branch 'MDL-60965-master' of git://github.com/andrewnicols/moodle 2017-12-12 11:15:03 +08:00
Dan Marsden
d55d207044 MDL-60979 cohort: allow description to be used in mustache templates. 2017-12-12 16:10:54 +13:00
Damyon Wiese
f0d9af6036 Merge branch 'MDL-60969_master' of git://github.com/markn86/moodle 2017-12-12 11:08:46 +08:00
Andrew Nicols
abb61e0b02 Merge branch 'MDL-60983' of git://github.com/timhunt/moodle 2017-12-12 10:56:37 +08:00
Damyon Wiese
57fe6616a8 Merge branch 'MDL-52538-master' of git://github.com/mihailges/moodle 2017-12-12 10:40:15 +08:00
Damyon Wiese
39377f8083 Merge branch 'MDL-44667-master' of https://github.com/snake/moodle 2017-12-12 10:26:08 +08:00
Damyon Wiese
740a81eeb2 Merge branch 'MDL-60968-master' of git://github.com/lameze/moodle 2017-12-12 10:19:00 +08:00
Damyon Wiese
8cae085071 Merge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle 2017-12-12 09:56:20 +08:00
Mathew May
aa6b85d2b7 MDL-57431 mod_quiz: Quiz editing help icon fix 2017-12-12 09:56:05 +08:00
Brendan Heywood
b588373656 MDL-60968 auth: Allow more flexibility with mapping attributes 2017-12-12 09:37:35 +08:00
Damyon Wiese
4786443998 Merge branch 'MDL-60041' of https://github.com/NeillM/moodle 2017-12-12 09:13:43 +08:00
Zig Tan
6901981962 MDL-42676 mod_assign: Display message fix when using grade override 
Logic fix in mod_assign locallib.php to correctly set the submissionlockedstatus,
and added associated unit test in test_grade_submission_override()
 2017-12-12 09:01:35 +08:00
Damyon Wiese
34adfcb4ee Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle 2017-12-12 08:55:57 +08:00
Mihail Geshoski
2034f57fe1 MDL-52538 lesson: Grade info displayed while ongoing score disabled 2017-12-12 08:54:51 +08:00
David Monllao
895e005989 MDL-60759 search_solr: Solr 7+ compatibility 2017-12-11 12:47:55 +01:00
Damyon Wiese
807ba44cc6 Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle 
Conflicts:
	theme/boost/scss/moodle/modules.scss
 2017-12-11 16:55:27 +08:00
Damyon Wiese
42cec80673 Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle 2017-12-11 16:47:19 +08:00
Neill Magill
3acb294828 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.
 2017-12-11 08:41:16 +00:00
Neill Magill
61fad215f1 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.
 2017-12-11 08:40:58 +00:00