mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 18:42:40 +01:00
Code Issues Projects Releases Wiki Activity
86,560 Commits 36 Branches 527 Tags
Commit Graph

1178 Commits

Author SHA1 Message Date
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
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
Simey Lameze
522b84be04 MDL-60092 block_calendar_upcoming: convert to template 2017-10-10 13:55:35 +08:00
Simey Lameze
666d03e119 MDL-60092 core_calendar: new upcoming mini template 2017-10-10 13:55:29 +08:00
Jun Pataleta
e34196d6ef Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle 2017-10-10 13:30:34 +08:00
Andrew Nicols
5873e1d234 MDL-60374 calendar: Add transition on event show/hide in monthly view 2017-10-09 12:04:04 +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
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