moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86752 commits 37 branches 544 tags 1.3 GiB
Commit graph

86752 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
e08c74f5bc MDL-59630 analytics: Unit tests fixes 2017-10-05 17:38:17 +02:00
Michael Spall
151138afe1 MDL-60319 Google converter: Add html to convertible types 
Add html files to the file types that Google can convert. This allows
the Google Drive converter to convert online submissions to pdf. This
fixes an issue where if online submissions is selected and the Google
Drive converter is used all conversions fail and produce a single
blank pdf. Credit to Peter Svec for the idea for this fix.
 2017-10-05 08:31:57 -06:00
Jun Pataleta
7004185453 Merge branch 'MDL-60096-master' of git://github.com/junpataleta/moodle 2017-10-05 16:56:46 +08:00
Andrew Nicols
3ea4f446bc MDL-60096 calendar: Add JS for day view 2017-10-05 16:54:47 +08:00
Jun Pataleta
736b368920 Merge branch 'MDL-60352-master' of git://github.com/andrewnicols/moodle 2017-10-05 16:16:34 +08:00
Andrew Nicols
1afd3c72aa Merge branch 'MDL-59630_master' of git://github.com/dmonllao/moodle 2017-10-05 14:56:57 +08:00
Jun Pataleta
96c27b3658 Merge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle 2017-10-05 14:53:31 +08:00
Andrew Nicols
1df40a2dce MDL-60352 calendar: Do not select original event for collection 2017-10-05 14:42:11 +08:00
Simey Lameze
a873ed2f37 MDL-59751 calendar: remove unused show_upcoming_events method 2017-10-05 14:27:58 +08:00
Andrew Nicols
e00aed518f MDL-59751 calendar: Update JS to be more sharable 2017-10-05 14:23:02 +08:00
Simey Lameze
001366a815 MDL-59751 core_calendar: move code to avoid duplication 2017-10-05 14:23:02 +08:00
Simey Lameze
2ca4dc8a2e MDL-59751 core_calendar: make upcoming view use AJAX 2017-10-05 14:23:02 +08:00
Simey Lameze
f7771eae08 MDL-59751 core_calendar: move new event button to header 2017-10-05 14:23:02 +08:00
Simey Lameze
e6d805e351 MDL-59751 core_calendar: add upcoming view templates 2017-10-05 14:23:02 +08:00
Simey Lameze
84ad738604 MDL-59751 core_calendar: add calendar_upcoming exporter 2017-10-05 14:23:01 +08:00
Simey Lameze
e830643858 MDL-59751 core_calendar: add get_calendar_upcoming_view webservice 2017-10-05 14:22:55 +08:00
Jun Pataleta
199d387d6e Merge branch 'MDL-59890-master-fix' of git://github.com/andrewnicols/moodle 2017-10-05 11:00:47 +08:00
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