Commit graph

1326 commits

Author SHA1 Message Date
David Monllao
0e0e92c5e0 Merge branch 'MDL-59759-master-2' of git://github.com/junpataleta/moodle 2017-09-07 10:52:20 +02:00
Eloy Lafuente (stronk7)
dd04df4164 MDL-59672 coding style: whitespace fixes 2017-09-07 10:52:18 +02:00
Eloy Lafuente (stronk7)
9d07b88ab4 Merge branch 'MDL-59672-master' of git://github.com/lameze/moodle 2017-09-07 10:52:06 +02:00
David Monllao
4cc3f4f086 Merge branch 'MDL-59974-master' of git://github.com/lameze/moodle 2017-09-07 10:50:17 +02:00
David Monllao
d8e789c837 Merge branch 'MDL-59846-master' of git://github.com/lameze/moodle 2017-09-07 10:49:36 +02:00
Ryan Wyllie
ea5f7707e7 MDL-59919 calendar: add file support to event form 2017-09-07 01:38:43 +00:00
Jun Pataleta
fb7fa04e3b MDL-59759 core_calendar: Use SAVE_CANCEL modal for delete dialog
* Plus reorganise the code to make it a little tidier.
2017-09-04 10:44:51 +08:00
Simey Lameze
da1f058254 MDL-59974 core_calendar: remove JS code no longer used 2017-09-04 09:49:12 +08:00
Simey Lameze
4d7f28d4fc MDL-59974 core_calendar: hide elements based on event type 2017-09-04 09:48:41 +08:00
Simey Lameze
29158c8b6f MDL-59672 core_calendar: set course event type on course context 2017-09-04 09:12:05 +08:00
Simey Lameze
0b8e721667 MDL-59846 core_calendar: add styling to action link 2017-09-04 08:38:51 +08:00
Simey Lameze
7b7924922e MDL-59864 core_calendar: add behat test for module events edit 2017-09-04 08:37:30 +08:00
Simey Lameze
4757780aea MDL-59864 core_calendar: add link to activity on module events 2017-09-04 08:37:30 +08:00
Andrew Nicols
8c2465eaf0 Merge branch 'MDL-59394-master-2' of git://github.com/ryanwyllie/moodle 2017-08-30 11:35:40 +08:00
Andrew Nicols
4520fdffd5 Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle 2017-08-30 11:30:59 +08:00
Ryan Wyllie
a06b3a27b7 MDL-59713 calendar: fix nav link ajax reload 2017-08-30 03:25:39 +00:00
Ryan Wyllie
aefb2950d3 MDL-59394 calendar: add drag and drop between months 2017-08-30 02:42:06 +00:00
Jun Pataleta
9e22016778 Merge branch 'MDL-59884-master' of git://github.com/lameze/moodle 2017-08-30 10:10:30 +08:00
Simey Lameze
b31a169560 MDL-59884 core_calendar: display spinner when reloading month content 2017-08-30 09:48:56 +08:00
Andrew Nicols
08bcea48d4 Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle 2017-08-29 15:28:45 +08:00
Andrew Nicols
506708f196 Merge branch 'MDL-59820-master' of git://github.com/lameze/moodle 2017-08-29 15:26:46 +08:00
Eloy Lafuente (stronk7)
f0e6ff9a8e Merge branch 'MDL-59669-master-3' of git://github.com/ryanwyllie/moodle 2017-08-29 02:15:18 +02:00
Andrew Nicols
a49c3d8aa0 MDL-59670 calendar: Select correct group when editing events 2017-08-25 11:27:20 +08:00
Ryan Wyllie
f6e8cc83ae MDL-59713 calendar: clicking day in monthly view opens new event modal 2017-08-25 01:37:20 +00:00
Ryan Wyllie
69b160ed12 MDL-59669 calendar: add unit tests for submit_create_update_form 2017-08-24 05:40:01 +00:00
Ryan Wyllie
6bb8889932 MDL-59669 calendar: add validation for eventtype in event form 2017-08-24 12:20:56 +08:00
Andrew Nicols
d839e25e9d Merge branch 'MDL-59699-master-fix2' of https://github.com/lameze/moodle 2017-08-24 09:58:09 +08:00
Andrew Nicols
ed50116863 Merge branch 'MDL-59675-master-fix1' of https://github.com/lameze/moodle 2017-08-24 09:57:28 +08:00
Simey Lameze
2d7008aeab MDL-59675 core_calendar: reload page after create event 2017-08-24 09:48:00 +08:00
Simey Lameze
2c65e0ce61 MDL-59677 core_calendar: replace the whole node on reload 2017-08-24 09:28:04 +08:00
Simey Lameze
3fa98f2381 MDL-59699 core_calendar: change course short to full name 2017-08-24 08:55:41 +08:00
Andrew Nicols
586181c7d6 MDL-59860 calendar: Remove trailing whitespace 2017-08-24 08:55:23 +08:00
Simey Lameze
81e736be5d MDL-59860 core_calendar: temp remove behat test 2017-08-24 08:42:53 +08:00
Andrew Nicols
9e413012b7 Merge branch 'MDL-59676-master' of git://github.com/lameze/moodle 2017-08-23 14:11:37 +08:00
Andrew Nicols
dcc8096ae3 Merge branch 'MDL-59675-master' of git://github.com/lameze/moodle 2017-08-23 14:10:40 +08:00
Simey Lameze
7e3658950d MDL-59674 core_calendar: use course full name on group events 2017-08-23 12:22:18 +08:00
Andrew Nicols
d4cbf2787a Merge branch 'MDL-59699-master-fix' of https://github.com/lameze/moodle 2017-08-23 12:02:41 +08:00
Simey Lameze
c87ad4e52c MDL-59699 core_calendar: use course full name instead 2017-08-23 11:08:19 +08:00
Simey Lameze
99a4e7faea MDL-59699 core_calendar: display course link under event type 2017-08-23 11:02:03 +08:00
Andrew Nicols
cbf0ec51af Merge branch 'MDL-59393-int-fix-1' of github.com:ryanwyllie/moodle 2017-08-23 10:54:51 +08:00
Simey Lameze
448f47271b MDL-59674 core_calendar: add course link to group events 2017-08-23 10:19:10 +08:00
Ryan Wyllie
96283892fe MDL-59393 calendar: fix CiBoT complaints 2017-08-23 02:09:43 +00:00
Andrew Nicols
6ca4e64606 Merge branch 'MDL-59393-master-2' of git://github.com/ryanwyllie/moodle 2017-08-23 09:44:01 +08:00
Ryan Wyllie
ca518350ff MDL-59393 calendar: use event context in update_event_start_day 2017-08-23 01:32:51 +00:00
Ryan Wyllie
28e030d9f9 MDL-59393 calendar: remove use of legacy event in event_exporter 2017-08-23 01:15:08 +00:00
Ryan Wyllie
909d08588d MDL-59393 calendar: stop user editing module events 2017-08-23 00:57:22 +00:00
Ryan Wyllie
5ca142dc5b MDL-59393 calendar: add event drag and drop to monthly view 2017-08-23 00:57:22 +00:00
Ryan Wyllie
c6fb931088 MDL-59393 calendar: add update_event_start_day external function 2017-08-23 00:56:27 +00:00
Ryan Wyllie
55f5fcb9c9 MDL-59393 calendar: add update_event_start_day to local api 2017-08-23 00:56:26 +00:00
Ryan Wyllie
0dc3aa1295 MDL-59393 calendar: set defaults for legacy event in mapper 2017-08-23 00:56:26 +00:00