mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-30 13:32:50 +02:00
Code Issues Projects Releases Wiki Activity
86,964 Commits 36 Branches 527 Tags
Commit Graph

1257 Commits

Author SHA1 Message Date
David Monllao
be88f0993d Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle 2017-11-06 21:45:14 +01:00
Andrew Nicols
f3743b3041 Merge branch 'MDL-60626-master' of git://github.com/damyon/moodle 2017-11-06 12:43:24 +08:00
Damyon Wiese
30890c2971 MDL-60626 calendar: Fix for overrides 
Override events do not have the courseid so we need to get it from the module instance.
 2017-11-06 12:21:27 +08:00
Damyon Wiese
9e0884d410 MDL-60626 calendar: Unit tests for capabilities 
Check various calendar external functions for capabilities.
 2017-11-06 11:11:28 +08:00
Damyon Wiese
af25b8fc7f MDL-60626 calendar: Check capabilities for api 
All external functions must check all capabilities before returning data.
The calendar API itself does not check capabilities (I wish it did), so we must be
careful exposing these functions to webservices.
 2017-11-06 11:11:28 +08:00
Jake Dallimore
eb354bdefa Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle 2017-11-06 09:29:46 +08:00
Andrew Nicols
b9fd516407 MDL-60361 calendar: Support all event types for calendar subs 2017-11-03 11:27:40 +08:00
Simey Lameze
20a5056df6 MDL-60638 calendar: fix event subscription variable names 2017-11-03 10:03:17 +08:00
Andrew Nicols
6630b38c95 MDL-60587 calendar: Adjust use of time() in unit tests 2017-11-03 09:04:10 +08:00
Andrew Nicols
e20752c4f5 MDL-60587 calendar: Fix un-validated params 2017-11-02 21:49:28 +08:00
Andrew Nicols
30ff29dc9f MDL-60587 calendar: Improve link params for calendar buttons 2017-11-02 21:49:28 +08:00
Andrew Nicols
6607c5ffb6 MDL-60587 calendar: Switch WS to use new helper 2017-11-02 21:49:28 +08:00
Andrew Nicols
7f14def230 MDL-60587 calendar: Add missing categoryid in upcoming WS 2017-11-02 21:49:28 +08:00
Andrew Nicols
39e364515f MDL-60587 calendar: Switch to new helper in main view 2017-11-02 21:49:28 +08:00
Andrew Nicols
57e8c9f748 MDL-60587 calendar: Correct category subscription in information 2017-11-02 21:49:28 +08:00
Andrew Nicols
7b7bf31d4c MDL-60587 calendar: Add helper to setup the calendar_information 2017-11-02 21:49:28 +08:00
Damyon Wiese
f18fb611c9 Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle 2017-11-02 15:46:42 +08:00
Andrew Nicols
43caf0217f MDL-60558 block_calendar_upcoming: Render the template when no events 2017-11-02 15:43:17 +08:00
Damyon Wiese
41080050b0 Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle 2017-11-02 13:03:35 +08:00
Damyon Wiese
71fc06aae5 Merge branch 'MDL-60645-master' of git://github.com/andrewnicols/moodle 2017-11-02 12:10:04 +08:00
Andrew Nicols
e3491a093a MDL-60558 calendar: Upcoming block should use the right template 2017-11-02 11:55:49 +08:00
Andrew Nicols
a0a78199b8 MDL-60558 calendar: Add event metadata to upcoming template 2017-11-02 11:55:49 +08:00
Andrew Nicols
d523cbcb26 MDL-60558 calendar: Upcoming should support categories 2017-11-02 11:54:43 +08:00
Andrew Nicols
5c9acb8164 MDL-60558 calendar: Adjust URL change 
The URL change belongs in the calendar_view, not the view_manager.
The view_manager is responsibe for updating the view, not for the
resultant actions from it.

This also changes to use pushState so as not to overwrite the current
location in history.
 2017-11-02 11:54:13 +08:00
Andrew Nicols
8242027da3 MDL-60558 calendar: Move edit event to CRUD 2017-11-02 11:53:52 +08:00
Andrew Nicols
fd2f1ae146 MDL-60558 calendar: Remove old SELECTORS 2017-11-02 11:53:49 +08:00
Andrew Nicols
c8419f87c0 MDL-60558 calendar: Harden event link detection 2017-11-02 11:53:26 +08:00
Damyon Wiese
671440d708 Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle 2017-11-02 11:38:57 +08:00
Andrew Nicols
6c3f463dbd MDL-60558 calendar: Move the summary modal to view_manager 2017-11-02 10:56:00 +08:00
Andrew Nicols
0df5c743ad MDL-60361 calendar: Make eventtype functionality a trait 2017-11-02 07:57:44 +08:00
Andrew Nicols
43a1e9a2a5 MDL-60645 calendar: Add missing clean classes 2017-11-01 09:36:15 +08:00
Jun Pataleta
73ec9b4778 Merge branch 'MDL-60635-master' of git://github.com/andrewnicols/moodle 2017-10-31 21:30:01 +13:00
Andrew Nicols
a37faf9c70 MDL-60635 calendar: Fix end of month issue with previous/next month 
This reverts to the previous way in which this was calculated.
 2017-10-31 08:51:50 +08:00
Jun Pataleta
391ea5b7de Merge branch 'MDL-59936-master' of git://github.com/andrewnicols/moodle 2017-10-30 14:34:58 +13:00
Ryan Wyllie
8f730872a7 MDL-59936 calendar: use event colour in summary modal header 2017-10-30 08:34:26 +08:00
Ryan Wyllie
4febb36efe MDL-59936 calendar: use icons in event summary modal 2017-10-30 08:33:54 +08:00
Jun Pataleta
cc80554892 Merge branch 'MDL-60608-master' of git://github.com/lameze/moodle 2017-10-30 11:47:54 +13:00
Andrew Nicols
eb3b38f04c MDL-60570 calendar: Correct course filter label in day view 2017-10-29 21:05:55 +08:00
Andrew Nicols
a1b696f943 MDL-60576 calendar: Remove underline between icons and text 2017-10-29 21:01:40 +08:00
Simey Lameze
0d049757c0 MDL-60608 calendar: change eventdefaultcontext default to 0 2017-10-27 14:19:16 +08:00
David Monllao
62a38a4ece Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle 2017-10-26 19:15:44 +02:00
David Monllao
fd39db29e2 Merge branch 'MDL-59973-master' of git://github.com/damyon/moodle 2017-10-26 09:47:22 +02:00
Damyon Wiese
ef7df2ae0a Merge branch 'MDL-60564_master' of git://github.com/markn86/moodle 2017-10-26 14:43:39 +08:00
Damyon Wiese
ed6d81c9f7 MDL-59973 calendar: Remove duplication 
The function calendar_get_default_courses is responsible for loading all variants of calendar
course lists.

1 the list of courses that the current user will see events for in the site calendar.
2 the list of courses the current user will see when they are looking at a specific course calendar.
3 the list of course calendars the current user can create / edit events in.
 2017-10-26 14:39:35 +08:00
Damyon Wiese
01ed53df0f MDL-59973 calendar: Only load required fields 
When loading courses for the course filter on the calendar, we only need the id and shortname.
 2017-10-26 14:21:29 +08:00
Damyon Wiese
4dc645d64d MDL-59973 calendar: Unittest calendar_get_default_courses 2017-10-26 13:28:01 +08:00
Damyon Wiese
a5327e449d MDL-59973 calendar: Admin calendar course lists 
Consolidate the logic for the list of courses an admin will see in the calendar.

They will see all courses if calendar_admincanseeall is enabled.

They will see only courses they are enrolled in of calendar_admincanseeall is not enabled.

They will also see the current course, if they are admin and it is not already in the list.

This applies to the course selector and the create and update event forms.

The calendar link in the navigation block has also been changed to link to the current course calendar instead of the global
one.
 2017-10-26 13:28:00 +08:00
Jake Dallimore
6e186498fd Merge branch 'MDL-59686-master' of git://github.com/lameze/moodle 2017-10-26 10:16:21 +08:00
Simey Lameze
3c2b703e00 MDL-59686 form: fix autosave support for editor field 2017-10-26 09:03:31 +08:00
Jun Pataleta
75909e3c92 Merge branch 'MDL-59938-master' of git://github.com/andrewnicols/moodle 2017-10-26 11:22:30 +13:00