20414 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
7fb95a9d2d Merge branch 'MDL-62834' of git://github.com/timhunt/moodle 2018-07-04 00:46:33 +02:00
David Monllao
2af5c8e7ef Merge branch 'MDL-60014-master-catcherror-nopermission-annotatepdfcron' of https://github.com/Eva-Dv/moodle 2018-07-03 23:33:01 +02:00
David Monllao
772ae9d4fd Merge branch 'MDL-62691-master' of git://github.com/bmbrands/moodle 2018-07-03 23:33:00 +02:00
David Monllao
3a0e92cd6a Merge branch 'MDL-32232-master' of https://github.com/lucaboesch/moodle 2018-07-03 13:59:57 +02:00
Jake Dallimore
25a592ff5f Merge branch 'MDL-62715-master' of git://github.com/andrewnicols/moodle 2018-07-03 08:49:35 +08:00
Helen Foster
9722f6a25e MDL-62763 lang: Merge English strings from the en_fix language pack
Significant string changes:

* various strings in tool_dataprivacy and tool_policy - 'Data Protection
  Officer' changed to 'privacy officer'
* idnumbermod_help,core - mentioning resource and custom reporting
2018-07-02 11:15:26 +02:00
Tim Hunt
8aedf6d478 MDL-62834 behat: new step for enabling filters 2018-06-29 11:26:41 +01:00
Zig Tan
a8f7818beb MDL-62533 assign: Show assign hidden status on grading summary page 2018-06-29 09:37:57 +08:00
Zig Tan
bc87f6a2e3 MDL-44081 assign: Fix Grader annotation button accessibility ordering 2018-06-29 09:26:58 +08:00
Luca Bösch
73e571aae1 MDL-32232 lesson: changing a page type chooser option for consistency 2018-06-28 23:06:34 +02:00
Eloy Lafuente (stronk7)
b66476d15d Merge branch 'wip-MDL-62755-master' of git://github.com/abgreeve/moodle 2018-06-28 01:55:53 +02:00
Eloy Lafuente (stronk7)
e872f93325 Merge branch 'MDL-41265-master' of git://github.com/mihailges/moodle 2018-06-27 03:06:47 +02:00
Juan Segarra Montesinos
77e17113a1 MDL-62288 mod_glossary: Add links to glossary entries for all users 2018-06-26 09:03:10 +02:00
Eva Davitasvili
88c77c8ea3 MDL-60014 assign: Annotate PDF - catch no permission error 2018-06-25 14:11:24 -04:00
Adrian Greeve
11d828ef6f MDL-62755 mod_assign: Update to unit tests.
Overrides are now checked to be exported properly.
2018-06-25 09:49:13 +08:00
Adrian Greeve
ea24047619 MDL-62755 mod_assign: Fix override export problem.
The cutoffdate and allowsubmissionsfromdate were not
being exported.
2018-06-25 09:49:13 +08:00
Mihail Geshoski
f721ac68d4 MDL-41265 resource: Page resource option to show/hide last modified 2018-06-25 09:13:04 +08:00
Tim Hunt
bc6687bab3 MDL-62698 quiz_overview: new index should not be unique 2018-06-22 13:32:04 +01:00
Tim Hunt
db421d4d52 MDL-62769 quiz statistics: graph should show all, not last, variant 2018-06-21 12:55:43 +01:00
Andrew Nicols
de06b63344 MDL-62715 mod_assign: Bump submissions back when grading in tests 2018-06-21 08:40:39 +08:00
David Monllao
62dc3fde0a Merge branch 'MDL-61482-master' of git://github.com/zig-moodle/moodle 2018-06-20 13:29:17 +02:00
Eloy Lafuente (stronk7)
61a9f8d147 Merge branch 'MDL-36424-master' of https://github.com/lucaboesch/moodle 2018-06-19 19:19:59 +02:00
Eloy Lafuente (stronk7)
3a55517a53 Merge branch 'MDL-62449-master' of git://github.com/sarjona/moodle 2018-06-19 18:18:51 +02:00
Zig Tan
8be71d396b MDL-61482 mod_assign: Clean html in offline grading CSV 2018-06-19 23:19:13 +08:00
Bas Brands
c8c595e6d0 MDL-62691 Theme boost: editpdf hide dropdown close btn 2018-06-19 16:57:10 +02:00
Zig Tan
fcb7d2a976 MDL-42818 assign: Add grading UI indicator about followup submission 2018-06-19 14:06:17 +08:00
Andrew Nicols
67196d5080 Merge branch 'MDL-60950-master' of git://github.com/damyon/moodle 2018-06-19 11:36:59 +08:00
Damyon Wiese
994d0da35e MDL-60950 assign: Update incompatible unit test
Maintain compatibility with unit test changes after MDL-55609.
2018-06-19 10:56:53 +08:00
Damyon Wiese
c957707106 MDL-60950 assign: Rename class
testable_assign was renamed to mod_assign_testable_assign
2018-06-19 10:53:51 +08:00
Damyon Wiese
07d237840e MDL-60950 assign: Robust filtering of grading table
For assignments with gradetype set to none, we need special handling when generating the query to filter submissions that need grading.
2018-06-19 10:09:42 +08:00
Damyon Wiese
a5ff898f90 MDL-60950 assign: Test for the requires grading filter
This test covers when the requires grading filter is applied, but the
assignment has no grade and the feedbackcomments plugin is disabled.
2018-06-19 10:09:42 +08:00
Eloy Lafuente (stronk7)
eeb0597493 Merge branch 'MDL-62571_master' of git://github.com/markn86/moodle 2018-06-19 01:49:05 +02:00
Sara Arjona
1d76dd714c MDL-62449 scorm: Move related data to data in the privacy export 2018-06-18 10:42:26 +02:00
Sara Arjona
cd3ef1fbc4 MDL-62449 scorm: Add SCORM data to privacy export (name, description) 2018-06-18 10:42:26 +02:00
Damyon Wiese
43c8e1f596 MDL-62643 assign: Skip empty online text files
Online text assignment submissions with no text entered into the editor should not
create a blank html document for providing feedback.
2018-06-15 14:07:08 +08:00
Ed Basset
1764defb5a MDL-36424 wiki: set group so subwiki tabs/pages display correctly 2018-06-14 17:33:18 +02:00
Eloy Lafuente (stronk7)
d0f9d0ef4d Merge branch 'MDL-62446-master' of git://github.com/lameze/moodle 2018-06-12 18:21:40 +02:00
David Monllao
bcb4a27dd6 Merge branch 'MDL-55609-master' of git://github.com/andrewnicols/moodle 2018-06-12 10:07:35 +02:00
Andrew Nicols
01d0c0cb49 Merge branch 'MDL-62628-master' of git://github.com/mihailges/moodle 2018-06-12 09:49:18 +08:00
Mark Nelson
4626c848c2 MDL-62571 mod_forum: fixed redirection URLs 2018-06-11 18:29:58 +08:00
Jun Pataleta
64818f403d MDL-61484 mod_chat: Add CHAT_SESSION_GAP constant 2018-06-11 15:59:13 +08:00
Jun Pataleta
d7b236fa5e MDL-61484 mod_chat: Fix chat_get_sessions logic 2018-06-11 15:59:06 +08:00
Jun Pataleta
70175dbe8f MDL-61484 mod_chat: More unit tests for chat
* For chat_get_sessions()
* Fix externallib test
2018-06-11 15:48:41 +08:00
Simey Lameze
424441471d MDL-62446 mod_glossary: optimize provider code 2018-06-08 10:25:45 +08:00
Simey Lameze
98d24a4824 MDL-62446 mod_glossary: improve privacy unit tests 2018-06-08 10:04:38 +08:00
Mihail Geshoski
6f48461344 MDL-62628 resource: Folder name formatting issue when displayed inline 2018-06-08 08:35:29 +08:00
Jun Pataleta
959d5fadc6 Merge branch 'MDL-46513_master' of git://github.com/markn86/moodle 2018-06-06 11:16:34 +02:00
Jun Pataleta
43cc39bbc2 Merge branch 'MDL-62225-master' of https://github.com/lucisgit/moodle 2018-06-06 11:16:31 +02:00
Jun Pataleta
d585953dfe Merge branch 'MDL-62586-master' of git://github.com/bmbrands/moodle 2018-06-06 11:16:28 +02:00
Orzu Ionut
403f553623 MDL-61670 assign: show uploaded files timestamp
Amended to fix commit message. Rename variable to lower.
2018-06-06 11:16:22 +02:00