Commit graph

86935 commits

Author SHA1 Message Date
Andrew Nicols
86679cb1ae MDL-59890 calendar: Use calculated context instead of guessing 2017-10-05 10:14:35 +08:00
Eloy Lafuente (stronk7)
bbc8116c53 Merge branch 'MDL-60130_master' of git://github.com/markn86/moodle 2017-10-04 23:47:07 +02:00
Eloy Lafuente (stronk7)
1258a59126 Merge branch 'MDL-60264-master' of git://github.com/jleyva/moodle 2017-10-04 23:06:17 +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
Eloy Lafuente (stronk7)
b6f370112d MDL-59890 upgrade: bump redirect_if_major_update_required 2017-10-04 22:17:25 +02: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
Juan Leyva
e348f6a541 MDL-60302 webservice: Allow CORS requests in webservice/upload.php
This will allow to upload files via Web Services using AJAX from
different domains, browser plugins, web apps, etc…
2017-10-04 12:39:51 +02:00
Jun Pataleta
2c1be712a3 Merge branch 'MDL-59890-master-fix' of git://github.com/junpataleta/moodle 2017-10-04 14:55:32 +08:00
Jun Pataleta
469c3b4645 MDL-59890 calendar: Reorganise data generation steps
* Reorganise the data generation steps to avoid creating cells with
empty string values.
2017-10-04 14:54:33 +08:00
Jun Pataleta
48a3a50aa4 MDL-59890 behat: Revert to checking if isset instead of not empty
Reverting changes made by commit
1957d33996
2017-10-04 14:24:15 +08:00
Jake Dallimore
32c369818c Merge branch 'MDL-57228' of git://github.com/timhunt/moodle 2017-10-04 13:42:51 +08:00
Derek Henderson
a8fe168e08 MDL-55652 grades: Added timemodified as index grade tables
Added timemodified to grade_categories_history,
grade_items_history, grade_outcomes_history,and scale_history.
2017-10-04 12:07:01 +08:00
Jun Pataleta
cd7cd9d9c1 Merge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle 2017-10-04 11:19:33 +08:00
Andrew Nicols
02150c9a1e MDL-59890 calendar: Add behat tests 2017-10-04 11:16:06 +08:00
Andrew Nicols
1957d33996 MDL-59890 behat: Check empty not isset for switchids 2017-10-04 11:16:06 +08:00
Andrew Nicols
fb3c0fc38b MDL-59890 calendar: Allow event creation in behat 2017-10-04 11:16:06 +08:00
Andrew Nicols
303d649aca MDL-59890 calendar: Correct context checks for edit test 2017-10-04 11:16:06 +08:00
Andrew Nicols
d097bfdda3 MDL-59890 calendar: Select current category when adding event 2017-10-04 11:16:05 +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
Eloy Lafuente (stronk7)
e092ec3117 Merge branch 'MDL-33174-master' of https://github.com/matt-catalyst/moodle 2017-10-03 23:01:45 +02:00
Eloy Lafuente (stronk7)
66fca829d4 Merge branch 'MDL-49005-master' of https://github.com/abias/moodle 2017-10-03 22:48:28 +02:00
Eloy Lafuente (stronk7)
4536f3084d Merge branch 'MDL-59273-master' of https://github.com/lucisgit/moodle 2017-10-03 22:38:13 +02:00
Eloy Lafuente (stronk7)
9376583e4f Merge branch 'MDL-59883-master' of git://github.com/andrewnicols/moodle 2017-10-03 20:58:23 +02:00
Eloy Lafuente (stronk7)
34ecee16bb Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle 2017-10-03 20:48:28 +02:00
Eloy Lafuente (stronk7)
945cf16df8 Merge branch 'MDL-58714-master' of git://github.com/jleyva/moodle 2017-10-03 20:38:16 +02:00
Eloy Lafuente (stronk7)
fe61786879 Merge branch 'MDL-60198-master' of git://github.com/jleyva/moodle 2017-10-03 20:15:42 +02:00
David Monllao
0328f12b07 MDL-59987 analytics: Add extra indicators for students at risk 2017-10-03 19:42:03 +02:00
David Monllao
0927604f8c MDL-59987 analytics: Add no students indicator to no teaching
Sneaking in a bug fix ;) (thanks in advance)
2017-10-03 19:41:43 +02:00
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
Eloy Lafuente (stronk7)
365665dbad Merge branch 'MDL-59250-master' of git://github.com/jleyva/moodle 2017-10-03 18:34:56 +02:00
AMOS bot
793de9664f Automatically generated installer lang files 2017-10-04 00:10:10 +08: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
Andrew Nicols
936235133a MDL-59890 calendar: Support for categories in legacy event fetch 2017-10-03 23:22:19 +08:00
Andrew Nicols
74475e5bb4 MDL-59890 calendar: Delete category events upon category removal 2017-10-03 23:22:18 +08:00
Andrew Nicols
d0e56d847a MDL-59890 calendar: Display category events on calendars 2017-10-03 23:22:18 +08:00
Andrew Nicols
5ba6507e5b MDL-59890 calendar: Exporters support for categories 2017-10-03 21:28:32 +08:00
Andrew Nicols
e9321ad07d MDL-59890 coursecat: Add helper to fetch nested view of coursecat 2017-10-03 21:28:31 +08:00
Andrew Nicols
02d0c4355e MDL-59890 calendar: Stop adding time for mini view - not used 2017-10-03 21:28:31 +08:00
Andrew Nicols
0085b0ea3c MDL-59890 calendar: Add support for the category to vault 2017-10-03 21:28:31 +08:00
Andrew Nicols
7d0a866c95 MDL-59890 calendar: Accept categories in calendar_info 2017-10-03 21:28:31 +08:00