Mark Nelson
c7fecfe0bb
MDL-59106 tool_analytics: fixed string describing 'onlycli' setting
2017-10-06 17:24:03 +08:00
Jake Dallimore
d8e9a23c48
weekly release 3.4dev
2017-10-06 14:34:29 +08:00
Jake Dallimore
6d88e204cf
NOBUG: Fixed file access permissions
2017-10-06 14:34:29 +08:00
Jake Dallimore
0081f5776e
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-10-06 14:34:28 +08:00
David Monllao
e08c74f5bc
MDL-59630 analytics: Unit tests fixes
2017-10-05 17:38:17 +02: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
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
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
1957d33996309d6fd448ce34c8568b904f78953c
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
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
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
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
