Jun Pataleta
75909e3c92
Merge branch 'MDL-59938-master' of git://github.com/andrewnicols/moodle
2017-10-26 11:22:30 +13:00
David Monllao
7851132177
Merge branch 'MDL-60516-master' of git://github.com/andrewnicols/moodle
2017-10-25 15:16:21 +02:00
David Monllao
4f7a80341e
Merge branch 'MDL-59942-master' of git://github.com/andrewnicols/moodle
2017-10-25 15:14:54 +02:00
David Monllao
5b93dc8539
Merge branch 'MDL-60560-master' of git://github.com/andrewnicols/moodle
2017-10-25 15:06:49 +02:00
Jake Dallimore
19fa690c3f
MDL-60429 calendar: fix for updating event course and group
...
The property courseid and groupid might not be set, so if updating,
use the existing value if a new value wasn't specified.
2017-10-25 12:45:54 +08:00
Jake Dallimore
e3a247849b
Merge branch 'MDL-60561-master' of git://github.com/andrewnicols/moodle
2017-10-25 12:45:53 +08:00
Jake Dallimore
c00e73dfe0
Merge branch 'MDL-60545_master' of git://github.com/markn86/moodle
2017-10-25 12:45:52 +08:00
Jake Dallimore
bbb9e17133
Merge branch 'MDL-60429-master' of git://github.com/lameze/moodle
2017-10-25 12:45:52 +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
79dff18711
MDL-59942 calendar: Add missing attribute to narrow day link
2017-10-24 15:35:31 +08:00
Andrew Nicols
9da0be8c46
MDL-60559 calendar: Upcoming block should respect type filter
2017-10-24 15:25:34 +08:00
Simey Lameze
6428642adb
MDL-60429 calendar: update group and course id for repeated events
2017-10-24 13:46:40 +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
05ce018002
MDL-60545 core_calendar: ensure 'All courses' shows accurate data
2017-10-24 13:17:14 +08:00
Andrew Nicols
80e4426aeb
MDL-60516 calendar: Update mini calendar on course change
2017-10-24 10:43:01 +08:00
Andrew Nicols
9eced5050b
MDL-60560 calendar: Correct type of JS event on update
2017-10-24 09:45:27 +08:00
David Monllao
bd3824519b
Merge branch 'MDL-60422_master' of git://github.com/markn86/moodle
2017-10-23 17:42:06 +02:00
Mark Nelson
72c4cacfa3
MDL-60422 core_calendar: do not lose track of the selected course
2017-10-23 17:18:28 +08:00
Andrew Nicols
345f23c984
MDL-60537 calendar: Fix behat following string changes
2017-10-23 08:26:24 +08:00
David Monllao
50a5feff05
Merge branch 'MDL-60406-master' of git://github.com/lameze/moodle
2017-10-20 04:38:06 +02:00
Simey Lameze
5a11e7f5f3
MDL-60406 core_calendar: proper calendar dates calculation
2017-10-20 10:32:41 +08:00
David Monllao
f2732541e8
Merge branch 'MDL-60444-master' of git://github.com/andrewnicols/moodle
2017-10-19 15:41:56 +02:00
David Monllao
c1c7cb9c42
Merge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle
2017-10-19 09:07:05 +02:00
Andrew Nicols
fd5e793cce
Merge branch 'MDL-60468-master' of git://github.com/lameze/moodle
2017-10-19 10:23:57 +08:00
Simey Lameze
05187c589d
MDL-60468 calendar: fix event type defaults logic
2017-10-18 15:41:05 +08:00
David Monllao
7152d2ff7a
Merge branch 'MDL-60176-master' of git://github.com/andrewnicols/moodle
2017-10-16 20:02:03 +02:00
David Monllao
5d5ebedf56
Merge branch 'MDL-60374-master' of git://github.com/andrewnicols/moodle
2017-10-16 18:26:55 +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
Andrew Nicols
4e84059e8f
MDL-60444 calendar: Correct variable name
2017-10-16 10:19:14 +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
4aae2cb19e
MDL-59921 core_calendar: remove unnecessary behat step
2017-10-11 16:37:46 +08:00
Simey Lameze
580a168a15
MDL-59921 calendar: fix wrong array assumptions
2017-10-11 16:26:51 +08:00
Jun Pataleta
1b3f3d5761
Merge branch 'MDL-60090-master' of git://github.com/andrewnicols/moodle
2017-10-11 15:58:46 +08:00
Andrew Nicols
a7ed05e720
MDL-60090 calendar: Add eventtype icon and truncate
2017-10-11 14:03:01 +08:00
Damyon Wiese
3f94d19060
Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle
2017-10-11 14:02:52 +08:00
Simey Lameze
ca14f182fc
MDL-60092 calendar: add missing upcoming view logic
2017-10-11 11:42:41 +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
Simey Lameze
de6d57cfd8
MDL-59921 core_calendar: fix event form behat failures
2017-10-10 15:22:45 +08:00
Simey Lameze
4259387ebb
MDL-60092 core_calendar: remove unused calendar_get_upcoming method
2017-10-10 13:55:35 +08:00
