moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
89666 commits 37 branches 540 tags 1.3 GiB
Commit graph

218 commits

Author SHA1 Message Date
Jun Pataleta
63b384d02a Merge branch 'MDL-59919-master' of git://github.com/ryanwyllie/moodle 2017-09-12 14:58:06 +08:00
Andrew Nicols
c8b6e9ab34 MDL-59392 calendar: Switch to templates in the cal block 
This commit adds a set of templates for the calendar month block, and
the events filter. The same data exporters used in the main calendar
view are utilised and the same logic.

Some additional data was added to the exporters, and in the long term
this will be used in the main monthly view so I did not feel it was
prudent to strip it out into a different view of the model.

AMOS BEGIN
 MOV [monthnext,access],[monthnext,calendar]
AMOS END
 2017-09-11 12:45:46 +08:00
David Monllao
0e0e92c5e0 Merge branch 'MDL-59759-master-2' of git://github.com/junpataleta/moodle 2017-09-07 10:52:20 +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
7b7924922e MDL-59864 core_calendar: add behat test for module events edit 2017-09-04 08:37:30 +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
Ryan Wyllie
69b160ed12 MDL-59669 calendar: add unit tests for submit_create_update_form 2017-08-24 05:40:01 +00:00
Andrew Nicols
d839e25e9d Merge branch 'MDL-59699-master-fix2' of https://github.com/lameze/moodle 2017-08-24 09:58:09 +08:00
Simey Lameze
2d7008aeab MDL-59675 core_calendar: reload page after create event 2017-08-24 09:48:00 +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
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
909d08588d MDL-59393 calendar: stop user editing module events 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
Simey Lameze
1228bb6cad MDL-59860 core_calendar: fix behat failures 2017-08-22 09:40:01 +08:00
Andrew Nicols
b7173c18e9 Merge branch 'MDL-59687-master' of git://github.com/lameze/moodle 2017-08-21 15:20:22 +08:00
Andrew Nicols
ba756e857b Merge branch 'MDL-59699-master' of git://github.com/lameze/moodle 2017-08-21 14:15:41 +08:00
Simey Lameze
21e3d8b8a3 MDL-59699 core_calendar: add steps to assert the course link 2017-08-21 13:35:53 +08:00
Simey Lameze
6a87019b13 MDL-59860 core_calendar: behat scenario for module events 2017-08-18 12:29:49 +08:00
Simey Lameze
ed84d85fdb MDL-59687 core_calendar: calendar feature improvement 2017-08-18 11:13:27 +08:00
Simey Lameze
a56a9b3937 MDL-59687 core_calendar: create event step needs to wait page ready 2017-08-18 11:12:41 +08:00
Simey Lameze
5d942f5a53 MDL-59810 core_calendar: test action events cannot be deleted 2017-08-15 12:05:10 +08:00
Simey Lameze
c448e19bff MDL-59382 core_calendar: fix behat failures 2017-08-02 07:52:20 +00:00
Simey Lameze
81170930c2 MDL-59382 core_calendar: change behat step 2017-08-02 04:47:43 +00:00
Ryan Wyllie
aa0912258d MDL-59382 calendar: add modal to create and update events 2017-08-02 04:47:43 +00:00
Simey Lameze
52380c823c MDL-59538 core_calendar: add behat step back 
Part of MDL-59333.
 2017-07-21 09:01:57 +08:00
Simey Lameze
ebebbc442c MDL-59383 core_calendar: remove failing behat steps 2017-07-14 11:42:56 +08:00
David Monllao
93f2056000 Merge branch 'wip-MDL-59441-master' of git://github.com/marinaglancy/moodle 2017-07-11 11:41:03 +02:00
Marina Glancy
5540c0979b MDL-59441 calendar: unittest fix for modules without generators 2017-07-04 11:16:08 +08:00
Mark Nelson
2fe7f706d7 MDL-59304 core_calendar: check if course is hidden in bailout callback 2017-07-04 10:11:34 +08:00
David Monllao
1243fce158 Merge branch 'wip-MDL-59308-master' of git://github.com/marinaglancy/moodle 2017-06-27 16:41:26 +02:00
Marina Glancy
70b6230829 MDL-59308 calendar: pass module context when known 
this will protect us from exceptions when context for removed instance can not be retrieved
 2017-06-22 13:42:22 +08:00
Marina Glancy
63e9e38202 MDL-58911 calendar: use the same callbacks in unittests and prod 
Remove unittest-specific callbacks for checking access and displaying
the calendar events on the dashboard.

This will allow plugin developers unittest the full behavior
of how their plugins add events to the dashboard.

Reset all static caches between unittests.
 2017-06-20 16:13:35 +08:00
Jun Pataleta
51807cf5c4 MDL-59101 calendar: Properly calculate expected until date 2017-06-07 23:09:17 +08:00
Jun Pataleta
723742fee0 MDL-59093 calendar: Use a fixed start day for forever BYMONTH test 2017-05-31 15:01:34 +08:00
Jun Pataleta
4eec39e2b2 MDL-58723 calendar: Better testing of forever recurring events 
* Change the start date of the parent event to the current date
  for tests that with events that recur forever.
* Limit query results to 100 for events that recur forever that can
  generate more than 100 event records.
 2017-05-16 14:39:53 +08:00
Dan Poltawski
3cc5abc163 Merge branch 'wip-MDL-58688-master-c' of git://github.com/marinaglancy/moodle 2017-05-08 10:31:37 +01:00
Jun Pataleta
472cae12a6 Merge branch 'MDL-58518-master' of git://github.com/ryanwyllie/moodle 2017-05-08 15:50:03 +08:00
Jun Pataleta
bf57bde20d MDL-58810 calendar: Add coverage for UUID in recurring events 2017-05-08 09:33:47 +08:00
Marina Glancy
47a710177a MDL-58688 calendar: retrieve event module without db queries 2017-05-04 16:53:19 +08:00
Cameron Ball
eeb27f03bd
MDL-58736 core_calendar: Revert calendar_get_events to 3.2 implementation 
We modified calendar_get_events in a non backwards compatible way
so instead of fixing that, an easier approch is to simply revert
it to the 3.2 implementation. This should be fine since the way
to get events is going to change in an upcomming release, and we
had to swap all occurences of calendar_get_events in core with
calendar_get_legacy_events to make sure the calendar and overview match.
 2017-05-04 12:19:35 +08:00
Marina Glancy
5900513f75
MDL-58688 calendar: use modinfo to check module availability 2017-05-03 15:07:43 +08:00
Ryan Wyllie
405f8491e5 MDL-58518 calendar: ignore events from courses user not enrolled in 2017-05-02 02:53:25 +00:00
Jake Dallimore
434f31bc12 Merge branch 'MDL-58575-master' of git://github.com/cameron1729/moodle 2017-05-01 12:14:42 +08:00
Cameron Ball
d0dc97bf3a
MDL-58575 core_calendar: Group override tests for same priority 
This patch adds tests for when group override events have the same
priority.
 2017-04-27 19:12:50 +08:00
David Monllao
af282469b4 Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle 2017-04-27 15:16:27 +08:00