19856 Commits

Author SHA1 Message Date
Andrew Nicols
544321235d Merge branch 'master_MDL-60276' of https://github.com/CengageEng/moodle 2017-10-11 09:38:47 +08:00
Eloy Lafuente (stronk7)
0a073e9d42 Merge branch 'MDL-60300' of https://github.com/NeillM/moodle 2017-10-11 01:39:55 +02:00
Eloy Lafuente (stronk7)
f8a86c157d Merge branch 'MDL-55358-master' of https://github.com/davidknu/moodle 2017-10-11 00:00:10 +02:00
Eloy Lafuente (stronk7)
70aeddcaf4 Merge branch 'MDL-60002-save-and-show-next' of https://github.com/abalbanyan/moodle 2017-10-10 20:14:42 +02:00
Juan Leyva
011c5ae476 MDL-60396 mod_workshop: Add checks for maximum gradeover 2017-10-10 17:04:57 +02:00
Juan Leyva
84346754f6 MDL-60377 webservice: Format correctly text returned by WS 2017-10-10 15:06:23 +02:00
Ryan Wyllie
4c1145009a MDL-60058 assign: show due date calendar event for teachers 2017-10-10 03:51:18 +00:00
Andrew Nicols
1e7ed737d2 Merge branch 'MDL-45366' of git://github.com/stronk7/moodle 2017-10-10 08:40:01 +08:00
Eloy Lafuente (stronk7)
6d170ad508 Merge branch 'MDL-60129_master-v2' of git://github.com/markn86/moodle 2017-10-09 23:17:36 +02:00
Andrew Nicols
7da1dd651a Merge branch 'MDL-60317' of git://github.com/timhunt/moodle 2017-10-09 14:05:57 +08:00
Neill Magill
078484f2e2 MDL-60300 Quiz: Offline update time not set correctly 2017-10-06 13:43:42 +01:00
Davo Smith
5ef66eaf7e MDL-60366 mod_feedback: fix deletion of valid anonymous duplicates 2017-10-06 13:38:08 +01:00
Eloy Lafuente (stronk7)
bbc8116c53 Merge branch 'MDL-60130_master' of git://github.com/markn86/moodle 2017-10-04 23:47:07 +02:00
Abdullah Albanyan
b56dc2a109 MDL-60002 js: Added a 'Save and show next' button to grading interface. 2017-10-04 13:39:33 -07:00
Juan Leyva
4c2a2bd7ce MDL-59241 mod_workshop: Fix testing found issues
- totalfilesize counting all submissions
- Improved function documentation
2017-10-04 20:23:02 +02:00
Juan Leyva
2973f64318 MDL-59248 mod_workshop: Fix permissions checks 2017-10-04 20:15:14 +02:00
Jake Dallimore
32c369818c Merge branch 'MDL-57228' of git://github.com/timhunt/moodle 2017-10-04 13:42:51 +08:00
Ankit Agarwal
d041a0b71f MDL-60301 libraries: PHP7.2 compatibility fix 2017-10-04 08:02:51 +05:30
Ankit Agarwal
61cef46120 MDL-60301 assignfeedback_editpdf: changes to files after FPDI update
1) Change the fpdi_bridge class so that it extends the pdf class,
rather than the TCPDF class.
2) Empty class check that was implemented before
3) Updated the editpdf/fpdi/readme_moodle.txt file to document the changes.
4) Updated the editpdf/thirdpartylibs.xml to reflect the update to the
FPDI library.
2017-10-04 08:02:48 +05:30
Juan Leyva
012c2b84b5 MDL-60144 mod_workshop: New WS mod_workshop_evaluate_submission 2017-10-03 19:28:56 +02:00
Juan Leyva
2c89c7c120 MDL-60144 mod_workshop: Move submission evaluation code to API 2017-10-03 19:28:44 +02:00
Juan Leyva
27fa248236 MDL-59239 mod_workshop: Move submission event trigger
The submission viewed event was being triggered at the beginning of the
script (before doing all the validation/safety checks).
I’ve moved the triggering to a better place so the event it is only
triggered when is verified that the user has permissions to view
the submission.
2017-10-03 19:26:40 +02:00
Juan Leyva
b99070b9d8 MDL-59239 mod_workshop: New WS mod_workshop_view_submission 2017-10-03 19:25:32 +02:00
Juan Leyva
4d201b824d MDL-59253 mod_workshop: New WS mod_workshop_get_grades_report 2017-10-03 19:22:09 +02:00
Juan Leyva
9e58617a7f MDL-59252 mod_workshop: New WS mod_workshop_evaluate_assessment 2017-10-03 19:16:43 +02:00
Juan Leyva
981f511a14 MDL-59252 mod_workshop: Move assessment evaluation code to API 2017-10-03 19:16:31 +02:00
Juan Leyva
d769f87171 MDL-59251 mod_workshop: New WS mod_workshop_get_grades 2017-10-03 19:07:12 +02:00
Juan Leyva
fe966a2720 MDL-59250 mod_workshop: New WS mod_workshop_update_assessment 2017-10-03 17:31:30 +02:00
Juan Leyva
57f44fbac4 MDL-59250 mod_workshop: Move assessment edition code to API function 2017-10-03 17:31:29 +02:00
Eloy Lafuente (stronk7)
4fce2a24ee MDL-59401 mod_workshop: rename method remanining fix 2017-10-03 13:05:12 +02:00
Juan Leyva
aac70425e4 MDL-59401 mod_workshop: New WS get_reviewer_assessments 2017-10-03 09:02:05 +02:00
Juan Leyva
46f5e9a0ef MDL-59248 mod_workshop: New WS get_assessment_form_definition 2017-10-03 08:51:30 +02:00
Juan Leyva
86928d2a7c MDL-59248 mod_workshop: New API check_examples_assessed_before_assessment
For consistency I renamed the old check_examples_assessed function to
check_examples_assessed_before_submission.
I also call the new function in the existing
get_workshop_access_information external function.
2017-10-03 08:51:29 +02:00
Mark Nelson
d8819e4ede MDL-60129 mod_glossary: added reset tags functionality 2017-10-03 12:50:37 +08:00
Mark Nelson
0b9249e63e MDL-60129 mod_forum: added reset tags functionality 2017-10-03 12:50:37 +08:00
Mark Nelson
19f8efd3be MDL-60129 mod_book: added reset tags functionality 2017-10-03 12:50:37 +08:00
Ankit Agarwal
faa9be014b MDL-60301 libraries: Upgrade FPDI to 1.6.2 2017-10-03 10:13:38 +05:30
Eloy Lafuente (stronk7)
d617d7022e Merge branch 'MDL-59247-master' of git://github.com/jleyva/moodle 2017-10-02 23:48:24 +02:00
Eloy Lafuente (stronk7)
aee4aca942 Merge branch 'MDL-59246-master' of git://github.com/jleyva/moodle 2017-10-02 23:08:25 +02:00
Eloy Lafuente (stronk7)
3255109721 Merge branch 'MDL-59242-master' of git://github.com/jleyva/moodle 2017-10-02 22:59:38 +02:00
Tim Hunt
32250b8836 MDL-60317 quiz reports: fix regression caused by MDL-57511 2017-10-02 18:22:58 +01:00
Andrew Nicols
86345473ec Merge branch 'MDL-59241-master' of git://github.com/jleyva/moodle 2017-10-02 15:52:40 +08:00
Andrew Nicols
39195b6aed Merge branch 'MDL-58790' of git://github.com/timhunt/moodle 2017-10-02 15:39:26 +08:00
Juan Leyva
b1e896cf2a MDL-59247 mod_workshop: New WS mod_workshop_get_assessment 2017-10-02 09:37:15 +02:00
Juan Leyva
30b54b823a MDL-59246 mod_workshop: New WS get_submission_assessments 2017-10-02 09:36:36 +02:00
Juan Leyva
6e2f4866b0 MDL-59242 mod_workshop: New WS mod_workshop_get_submission 2017-10-02 09:35:06 +02:00
Juan Leyva
3f08cfc530 MDL-59241 mod_workshop: New WS mod_workshop_get_submissions 2017-10-02 09:33:48 +02:00
ddelblanco
4325a4d23a MDL-60276 LTI Content Item: does not populate tool url when https 2017-09-28 09:54:35 -07:00
Vervoort, Claude
18ae59bea1 MDL-60253 lti: also consider securetoolurl for URL match 2017-09-27 13:26:42 -04:00
Eloy Lafuente (stronk7)
4da0f10286 Merge branch 'MDL-59931_master' of https://github.com/ctam/moodle 2017-09-27 01:16:10 +02:00