mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 15:02:41 +02:00
Code Issues Projects Releases Wiki Activity
86,860 Commits 36 Branches 528 Tags
Commit Graph

1225 Commits

Author SHA1 Message Date
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
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
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