1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00

1148 Commits

Author SHA1 Message Date
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
Jun Pataleta
96c27b3658 Merge branch 'MDL-59751-master-v2' of git://github.com/lameze/moodle 2017-10-05 14:53:31 +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
a873ed2f37 MDL-59751 calendar: remove unused show_upcoming_events method 2017-10-05 14:27:58 +08:00
Andrew Nicols
e00aed518f MDL-59751 calendar: Update JS to be more sharable 2017-10-05 14:23:02 +08:00
Simey Lameze
001366a815 MDL-59751 core_calendar: move code to avoid duplication 2017-10-05 14:23:02 +08:00
Simey Lameze
2ca4dc8a2e MDL-59751 core_calendar: make upcoming view use AJAX 2017-10-05 14:23:02 +08:00
Simey Lameze
f7771eae08 MDL-59751 core_calendar: move new event button to header 2017-10-05 14:23:02 +08:00
Simey Lameze
e6d805e351 MDL-59751 core_calendar: add upcoming view templates 2017-10-05 14:23:02 +08:00
Simey Lameze
84ad738604 MDL-59751 core_calendar: add calendar_upcoming exporter 2017-10-05 14:23:01 +08:00
Simey Lameze
e830643858 MDL-59751 core_calendar: add get_calendar_upcoming_view webservice 2017-10-05 14:22:55 +08:00
Andrew Nicols
86679cb1ae MDL-59890 calendar: Use calculated context instead of guessing 2017-10-05 10:14:35 +08:00
Jun Pataleta
469c3b4645 MDL-59890 calendar: Reorganise data generation steps
* Reorganise the data generation steps to avoid creating cells with
empty string values.
2017-10-04 14:54:33 +08:00
Jun Pataleta
cd7cd9d9c1 Merge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle 2017-10-04 11:19:33 +08:00
Andrew Nicols
02150c9a1e MDL-59890 calendar: Add behat tests 2017-10-04 11:16:06 +08:00
Andrew Nicols
303d649aca MDL-59890 calendar: Correct context checks for edit test 2017-10-04 11:16:06 +08:00
Andrew Nicols
d097bfdda3 MDL-59890 calendar: Select current category when adding event 2017-10-04 11:16:05 +08:00
Eloy Lafuente (stronk7)
9376583e4f Merge branch 'MDL-59883-master' of git://github.com/andrewnicols/moodle 2017-10-03 20:58:23 +02:00
Eloy Lafuente (stronk7)
34ecee16bb Merge branch 'MDL-59882-master' of git://github.com/andrewnicols/moodle 2017-10-03 20:48:28 +02:00
Andrew Nicols
936235133a MDL-59890 calendar: Support for categories in legacy event fetch 2017-10-03 23:22:19 +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
02d0c4355e MDL-59890 calendar: Stop adding time for mini view - not used 2017-10-03 21:28:31 +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
7d0a866c95 MDL-59890 calendar: Accept categories in calendar_info 2017-10-03 21:28:31 +08:00
Andrew Nicols
bc01fbbd81 MDL-59883 behat: Update close button link 2017-10-02 13:05:16 +08:00
Andrew Nicols
2a77813b51 MDL-59882 behat: Update known uses of dialogue CSS 2017-10-02 12:44:37 +08:00
Jun Pataleta
2340579586 MDL-60306 calendar: Fix rrule_manager unit test
* The calculation of the expected date should depend on the comparison
with the start date's date and not it's exact timestamp.
2017-10-02 09:18:37 +08:00
Andrew Nicols
05f184bb7f MDL-59890 calendar: Add ability to add category events 2017-09-29 08:57:08 +08:00
Jake Dallimore
6fcf5b679d Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle 2017-09-27 12:56:56 +08:00
Andrew Nicols
529e877614 MDL-59940 calendar: Fix random behat fails when changing month 2017-09-27 12:00:33 +08:00
Andrew Nicols
e0946346ca MDL-59940 calendar: Fix behat test for lookahead feature 2017-09-27 12:00:32 +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
Eloy Lafuente (stronk7)
e03484eec5 Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle 2017-09-25 23:07:05 +02:00
Andrew Nicols
abf00dad41 MDL-59940 calendar: Fix eslint errors 2017-09-25 11:52:39 +08:00
Andrew Nicols
bc2cca3a0d MDL-59940 calendar: Improve event start time default
Create events on the first day of the month when not in the current
month.
2017-09-25 11:52:08 +08: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
c602220798 MDL-59750 core_calendar: fix minithree logic on get_view 2017-09-20 13:25:19 +08:00
Simey Lameze
563ae695dc MDL-59750 calendar: fix logic on subscription template 2017-09-20 12:51:11 +08:00
Simey Lameze
d85651d82c MDL-59750 core_calendar: remove show_day method 2017-09-20 12:51:02 +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
ac671b3739 MDL-59750 core_calendar: rename template month_header to header 2017-09-20 12:48:26 +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