Commit graph

94773 commits

Author SHA1 Message Date
Jake Dallimore
527595f3f8 Merge branch 'MDL-66409-edit-numerical/master' of https://github.com/RaAstons/moodle 2019-09-10 13:34:36 +08:00
Andrew Nicols
add66da52d Merge branch 'MDL-63250-master' of https://github.com/Kathrin84/moodle 2019-09-10 12:33:20 +08:00
Andrew Nicols
158df6275e Merge branch 'MDL-66537-master' of git://github.com/peterRd/moodle 2019-09-10 12:18:16 +08:00
Jake Dallimore
e524921353 Merge branch 'MDL-66599_master' of git://github.com/dmonllao/moodle 2019-09-10 10:46:28 +08:00
Peter
44ad3e5171 MDL-66537 assign: Force rotate buttons to keep positioning in RTL langs 2019-09-10 10:23:13 +08:00
Andrew Nicols
95d3a87dd4 Merge branch 'MDL-66502-master' of git://github.com/junpataleta/moodle 2019-09-10 09:35:08 +08:00
Frédéric Massart
f3847964b6 MDL-66502 javascript: Remove extension from AMD module names 2019-09-09 16:25:17 +08:00
Raphaël Santos
21d6123fbd
MDL-66409 mod_lesson: Fix editing of numerical pages
This avoids using the "magic" `isset` function implemented
within the lesson_base class (which returns the `empty` function).
In the case of the answer beeing `0`, the test fails and the answer
is considered to be deleted.
2019-09-09 09:39:34 +02:00
Andrew Nicols
259467d283 Merge branch 'MDL-66488' of https://github.com/willob99/moodle 2019-09-09 09:07:07 +08:00
David Monllaó
f5583e9718 MDL-66599 analytics: New index for analytics_used_analysables 2019-09-09 08:30:50 +08:00
Will O'Brien
163750f3e5 MDL-66488 mod_assign: make submission comments textarea expandable
Allow submission comments textarea on assignment "View all submissions"
page to expand both ways, rather than just vertically.
2019-09-06 23:15:52 +01:00
Eloy Lafuente (stronk7)
a672f021ea weekly release 3.8dev 2019-09-05 17:14:21 +02:00
Eloy Lafuente (stronk7)
245cc67078 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-09-05 17:14:18 +02:00
Jake Dallimore
a7e33b03a4 Merge branch 'MDL-56223-master' of git://github.com/lameze/moodle 2019-09-05 17:20:03 +08:00
Simey Lameze
1db417c2f2 MDL-56223 calendar: fix wrong create_calendar_events WS phpdoc 2019-09-05 17:15:17 +08:00
Simey Lameze
2d132fda75 MDL-56223 calendar: show the number of deleted events 2019-09-05 17:15:14 +08:00
Simey Lameze
d5727ed3ba MDL-56223 calendar: skip events updating if nothing has changed 2019-09-05 16:18:37 +08:00
Andrew Nicols
413172521a Merge branch 'MDL-65550-master' of git://github.com/jleyva/moodle 2019-09-05 11:38:36 +08:00
Jake Dallimore
cd1bdc7946 Merge branch 'MDL-66551-master' of git://github.com/lameze/moodle 2019-09-05 11:12:35 +08:00
Andrew Nicols
506a0f4bc0 MDL-66340 setup; Whitepace fix 2019-09-05 10:50:25 +08:00
Andrew Nicols
bca45d08fd Merge branch 'MDL-66340' of https://github.com/brendanheywood/moodle 2019-09-05 10:45:55 +08:00
Simey Lameze
8c07d7d760 MDL-66551 core_user: remove orphaned calendar subscriptions 2019-09-05 10:21:05 +08:00
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
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