Commit graph

94804 commits

Author SHA1 Message Date
Andrew Nicols
3af598c75c Merge branch 'MDL-66391-master' of https://bitbucket.org/isprynt/moodle 2019-09-05 09:59:01 +08:00
Jake Dallimore
2796356278 Merge branch 'MDL-66367_master' of git://github.com/markn86/moodle 2019-09-05 09:26:28 +08:00
Eloy Lafuente (stronk7)
9533156775 Merge branch 'MDL-66072-master-3' of git://github.com/peterRd/moodle 2019-09-05 02:48:00 +02:00
Eloy Lafuente (stronk7)
1e248a654e Merge branch 'MDL-66560-master' of https://github.com/lucaboesch/moodle 2019-09-05 02:15:15 +02:00
AMOS bot
cf39122c79 Automatically generated installer lang files 2019-09-05 00:11:50 +00:00
Mahmoud.Kassaei
1d89daf329 MDL-66563 Questions: Drag and Drop qtypes in high-contrast 2019-09-04 15:32:16 +01:00
Segun Babalola
85d142f56a MDL-66391 core_course: Fix to send correct Ajax parameter for userid 2019-09-04 12:10:53 +01:00
Mark Nelson
af8a70756f MDL-66367 core: don't cache templates if templaterev is invalid 2019-09-04 12:54:02 +02:00
Mark Nelson
9e5edc7f68 MDL-66367 core: use templaterev as the cache key when getting templates 2019-09-04 12:54:02 +02:00
Mark Nelson
988482f077 MDL-66367 core: make templaterev available in JS 2019-09-04 12:54:02 +02:00
Mark Nelson
e63395bbed MDL-66367 core: added templaterev variable 2019-09-04 12:54:02 +02:00
Mark Nelson
5beb388516 MDL-66367 core: added new cachetemplates setting 2019-09-04 12:54:02 +02:00
Andrew Nicols
eb70a00163 Merge branch 'MDL-66137-38_mod_assign_marking_workflow_incorrect_grade_display' of https://github.com/tomdickman/moodle 2019-09-04 13:44:49 +08:00
Tom Dickman
028c5ed5f9 MDL-66137 mod_assign: fixed marking workflow incorrect grade display
Aligned logic between quick grading changes and set marking workflow state changes to accurately
finalise or remove final grade from the gradebook, depending on the marking workflow state if
being used.
2019-09-04 14:29:30 +10:00
Andrew Nicols
f37035cb04 Merge branch 'MDL-66554-master' of git://github.com/jleyva/moodle 2019-09-04 12:24:02 +08:00
Andrew Nicols
38d2c992e4 Merge branch 'MDL-66500-master-unoconvwarning' of git://github.com/mudrd8mz/moodle 2019-09-04 12:14:00 +08:00
Ryan Wyllie
3fb0cbd4bb MDL-62284 javascript: prevent nested JS mustache handler calls
Prevent the JS mustache helper from being executed from within
the render call of another mustache helper because it can allow
users to inject JS into the page.
2019-09-04 11:22:51 +08:00
Ryan Wyllie
f9664b0c19 MDL-62284 output: prevent nested JS mustache handler calls
Prevent the JS mustache helper from being executed from within
the render call of another mustache helper because it can allow
users to inject JS into the page.
2019-09-04 11:22:51 +08:00
Jake Dallimore
52a74c46ba Merge branch 'MDL-66265-master' of git://github.com/andrewnicols/moodle 2019-09-04 11:02:27 +08:00
Andrew Nicols
324f76308d MDL-66265 javascript: More specific overrides in eslintrc 2019-09-04 10:47:21 +08:00
AMOS bot
8fca8c140c Automatically generated installer lang files 2019-09-04 00:10:59 +00:00
Eloy Lafuente (stronk7)
9483886459 Merge branch 'MDL-66265-master' of git://github.com/andrewnicols/moodle 2019-09-04 02:07:42 +02:00
Eloy Lafuente (stronk7)
700e5ca69c Merge branch 'MDL-66532-master' of git://github.com/andrewnicols/moodle 2019-09-04 01:46:11 +02:00
Peter
14db737452 MDL-66072 core: Remove ancillary sharing functions and code 2019-09-04 07:09:43 +08:00
Peter
020bad738a MDL-66072 core: Remove course sharing and related capabilities 2019-09-04 07:09:05 +08:00
Andrew Nicols
9ec0cbe9ee MDL-66265 javascript: Ignore camelcase in Gruntfile 2019-09-04 06:48:11 +08:00
Andrew Nicols
f59ac4166c MDL-66265 javascript: Add jshint ignore for ES6 files in root dir 2019-09-04 06:48:11 +08:00
Andrew Nicols
b5fbca8f4a MDL-66265 javascript: Add basic jshint ignores 2019-09-04 06:48:11 +08:00
Andrew Nicols
ad2574f770 MDL-66265 javascript: Bump jshint version 2019-09-04 06:48:11 +08:00
Andrew Nicols
d2c0f54cea MDL-66532 javascript: Lock NPM version for NVM 2019-09-04 06:45:51 +08:00
Eloy Lafuente (stronk7)
3085a5843a Merge branch 'MDL-63315-master' of https://github.com/sammarshallou/moodle 2019-09-04 00:14:53 +02:00
Eloy Lafuente (stronk7)
3213963f96 MDL-66120 block_community: make upgrade steps match current version 2019-09-03 12:32:13 +02:00
Eloy Lafuente (stronk7)
ea1283ddca Merge branch 'MDL-66120-master' of git://github.com/peterRd/moodle 2019-09-03 12:27:34 +02:00
Andrew Nicols
9bb085dd1a Merge branch 'MDL-66434-master' of https://github.com/lucaboesch/moodle 2019-09-03 12:40:38 +08:00
Andrew Nicols
fce4664899 Merge branch 'MDL-62161' of https://github.com/paulholden/moodle 2019-09-03 11:26:19 +08:00
Jake Dallimore
3f64863d22 Merge branch 'MDL-38555-master' of https://github.com/sammarshallou/moodle 2019-09-03 11:07:10 +08:00
Peter
1d6f041a2e MDL-66120 block_community: Remove community block and related caps
With the sunsetting of moodle.net, the community block will no longer
be functional, so removing the block and related caps
2019-09-03 09:30:50 +08:00
Andrew Nicols
ebd30140dc Merge branch 'MDL-65042-master' of git://github.com/jleyva/moodle 2019-09-03 09:29:00 +08:00
AMOS bot
b453627935 Automatically generated installer lang files 2019-09-03 00:11:24 +00:00
AMOS bot
ecf1234950 Automatically generated installer lang files 2019-09-03 00:11:23 +00:00
Andrew Nicols
76b5fd3e11 Merge branch 'MDL-66504' of git://github.com/stronk7/moodle 2019-09-03 07:04:18 +08:00
Andrew Nicols
932d89250d Merge branch 'MDL-66229-master' of git://github.com/jleyva/moodle 2019-09-03 07:02:40 +08:00
Eloy Lafuente (stronk7)
5795785472 Merge branch 'MDL-66457-master' of git://github.com/andrewnicols/moodle 2019-09-03 00:54:42 +02:00
Eloy Lafuente (stronk7)
1bf2b6d52a MDL-66504 lang: Apply cantblockuser changes to behat tests 2019-09-02 19:00:28 +02:00
Juan Leyva
d4985a7739 MDL-66501 tool_mobile: Prevent URLs in custom scheme 2019-09-02 17:04:35 +02:00
Jun Pataleta
b4c92fb75b MDL-66187 format_singleactivity: Make sure available types is not empty 2019-09-02 17:04:35 +02:00
Andrew Nicols
208397c120 MDL-66187 course: Respect :addinstance in single activity format 2019-09-02 17:04:35 +02:00
Andrew Nicols
ed080a580f MDL-66181 course: Only assign roles that the user is allowed to assign 2019-09-02 17:04:35 +02:00
Andrew Nicols
8cb4578de8 MDL-66181 behat: You check checkboxes, not click them 2019-09-02 17:04:35 +02:00
Michael Hawkins
32e2e06a87 MDL-55451 mod_forum: Limit subscription redirect to internal URLs 2019-09-02 17:04:35 +02:00