moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87860 commits 37 branches 544 tags 1.3 GiB
Commit graph

87860 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tyler Bannister
e53a38c666 MDL-60653 Navigation: Fixed loose string comparison. 
The previous comparison would sometimes evaluate to true when the
navigation key was not a string.
 2017-12-12 12:32:27 +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
Mihail Geshoski
b68b5f55ca MDL-57727 reports: Activity completion report sorting problem 2017-12-12 09:39:17 +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
Simey Lameze
97f4556a94 MDL-60750 mod_quiz: only apply form css rules on clean theme 2017-12-11 16:56:06 +08: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
Mihail Geshoski
83b9a7c88c MDL-56197 lesson: Multichoice answers not on same line as radio button 2017-12-11 15:49:24 +08:00
Andrew Nicols
10cc00b4af Merge branch 'MDL-58272-master-2' of https://github.com/snake/moodle 2017-12-11 14:58:14 +08:00
Damyon Wiese
67c0e18ca2 Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle 2017-12-11 14:54:46 +08:00
Simey Lameze
5c1ea9aea5 MDL-60057 mod_lesson: add unit tests for callbacks 2017-12-11 14:45:04 +08:00
Simey Lameze
f077e0af7e 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
 2017-12-11 14:29:16 +08:00
Marina Glancy
8326cc5e3e MDL-60594 xmlrpc: wrapper for buggy xmlrpc_decode 2017-12-11 14:27:06 +08:00
Damyon Wiese
5258525f0a Merge branch 'MDL-60060-master' of git://github.com/lameze/moodle 2017-12-11 14:08:08 +08:00
Simey Lameze
61ac58a887 MDL-60060 mod_data: add unit tests for callbacks 2017-12-11 14:05:00 +08:00
Simey Lameze
5e401a2a51 MDL-60060 mod_data: add calendar drag and drop callbacks 2017-12-11 14:05:00 +08:00
Ankit Agarwal
8d6b7f0c6c MDL-60861 analytics: Remove enable menu, if no timesplitting method 2017-12-11 10:47:02 +05:30
Ankit Agarwal
fabe98ac92 MDL-60861 analytics: Enabling a model requires timesplitting 2017-12-11 10:47:01 +05:30
Damyon Wiese
fe955c5645 Merge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle 2017-12-11 12:56:18 +08:00
Shamim Rezaie
9d27b68ce8 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.
 2017-12-11 12:54:49 +08:00
Damyon Wiese
c6a507e9e7 Merge branch 'MDL-60948-master' of git://github.com/andrewnicols/moodle 2017-12-11 12:52:23 +08:00
Andrew Nicols
b9819842d9 MDL-60948 tool_httpsreplace: Correct use of test URLs 2017-12-11 12:05:57 +08:00