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
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
Jake Dallimore
e3a247849b
Merge branch 'MDL-60561-master' of git://github.com/andrewnicols/moodle
2017-10-25 12:45:53 +08:00
Mark Nelson
8e85371800
MDL-60564 calendar: removed duplication of exporter properties
2017-10-25 12:06:26 +08:00
Mark Nelson
429f78412d
MDL-60564 calendar: removed unnecessary get_new_event_button()
2017-10-24 17:49:28 +08:00
Mark Nelson
d2065abd0b
MDL-60564 calendar: removed unnecessary get_course_filter_selector()
2017-10-24 17:49:26 +08:00
Andrew Nicols
acd146fe7c
MDL-59938 calendar: Only show repeat information if repeating event
2017-10-24 16:00:36 +08:00
Andrew Nicols
349d379616
MDL-60561 calendar: Increase event limit for calendar
...
It's quite common to have more than 50 events in a calendar month, but
we do not want to change the default value when the API is called in
other ways.
2017-10-24 13:31:05 +08:00
Mark Nelson
72c4cacfa3
MDL-60422 core_calendar: do not lose track of the selected course
2017-10-23 17:18:28 +08:00
David Monllao
7152d2ff7a
Merge branch 'MDL-60176-master' of git://github.com/andrewnicols/moodle
2017-10-16 20:02:03 +02:00
Jun Pataleta
55b5133595
Merge branch 'MDL-60307-master' of git://github.com/lameze/moodle
2017-10-16 13:43:22 +08:00
Simey Lameze
166cd10aa7
MDL-60307 core_calendar: rename subscriptions name and url
2017-10-16 12:58:48 +08:00
Damyon Wiese
6dc633fd93
Merge branch 'MDL-60058-master-4' of git://github.com/ryanwyllie/moodle
2017-10-16 12:28:59 +08:00
Ryan Wyllie
a4f949442c
MDL-60058 calendar: fix event context issue in month_detailed
2017-10-13 06:38:02 +00:00
Ryan Wyllie
c56dd950eb
MDL-60058 calendar: add visual indicator to UI for valid drop zones
2017-10-13 06:18:44 +00:00
Simey Lameze
2ab3787e18
MDL-59921 calendar: remove disabledIf from group select
2017-10-12 09:19:43 +08:00
Simey Lameze
580a168a15
MDL-59921 calendar: fix wrong array assumptions
2017-10-11 16:26:51 +08:00
Jun Pataleta
8c0f6e5419
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
2017-10-11 11:07:14 +08:00
Simey Lameze
0108fdfa70
MDL-59921 calendar: fix missing course error on event form
2017-10-11 10:03:42 +08:00
Damyon Wiese
32d641c009
Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle
2017-10-10 17:17:56 +08:00
Jun Pataleta
7a87627b16
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
2017-10-10 16:19:36 +08:00
Simey Lameze
7522ed1f23
MDL-59921 core_calendar: fix phpunit failures on event form
2017-10-10 15:50:46 +08:00
Jun Pataleta
e34196d6ef
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle
2017-10-10 13:30:34 +08:00
Simey Lameze
8766097ed6
MDL-60070 core_calendar: remove old iCal icon
2017-10-09 10:20:02 +08:00
Simey Lameze
b9a4c3df7a
MDL-60092 core_calendar: add viewurl attribute to exporter
2017-10-09 10:01:30 +08:00
Simey Lameze
86244e9102
MDL-59921 calendar: replace selector for groups events
2017-10-09 09:51:14 +08:00
Simey Lameze
4b9c662b2a
MDL-59921 calendar: replace selector for course events
2017-10-09 09:51:14 +08:00
Andrew Nicols
70569dadcd
MDL-60176 calendar: Show all activity events are course events
2017-10-08 21:05:59 +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
1df40a2dce
MDL-60352 calendar: Do not select original event for collection
2017-10-05 14:42:11 +08:00
Simey Lameze
84ad738604
MDL-59751 core_calendar: add calendar_upcoming exporter
2017-10-05 14:23:01 +08:00
Andrew Nicols
d0e56d847a
MDL-59890 calendar: Display category events on calendars
2017-10-03 23:22:18 +08:00
Andrew Nicols
5ba6507e5b
MDL-59890 calendar: Exporters support for categories
2017-10-03 21:28:32 +08:00
Andrew Nicols
0085b0ea3c
MDL-59890 calendar: Add support for the category to vault
2017-10-03 21:28:31 +08:00
Andrew Nicols
05f184bb7f
MDL-59890 calendar: Add ability to add category events
2017-09-29 08:57:08 +08:00
Eloy Lafuente (stronk7)
25759080d6
Merge branch 'MDL-60156-master' of git://github.com/andrewnicols/moodle
2017-09-26 20:36:25 +02:00
Andrew Nicols
3fb45f57e4
MDL-60156 calendar: Replace add event button template
2017-09-25 11:47:55 +08:00
Andrew Nicols
39ad9cf333
MDL-60158 calendar: Fix footer options when viewing as guest
2017-09-25 11:44:32 +08:00
Simey Lameze
63b13467a9
MDL-59750 calendar: organise exporters code
2017-09-20 12:50:52 +08:00
Simey Lameze
5a35675e53
MDL-59750 calendar: add edit and delete url to exporter
2017-09-20 12:50:43 +08:00
Simey Lameze
146d371344
MDL-59750 calendar: render day view using templates
2017-09-20 12:50:12 +08:00
Simey Lameze
578eb78981
MDL-59750 core_calendar: add next and previous days handling methods
2017-09-20 12:47:38 +08:00
Simey Lameze
8afe9f8a14
MDL-59750 core_calendar: better handling of event subscription
2017-09-20 12:47:27 +08:00
Dan Poltawski
be5d95fc74
Merge branch 'MDL-59920-master' of git://github.com/andrewnicols/moodle
2017-09-19 18:14:18 +01:00
Ryan Wyllie
39fe5929c6
MDL-59922 calendar: allow editing of activity events
2017-09-19 06:48:57 +00:00
