moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86761 commits 37 branches 540 tags 1.3 GiB
Commit graph

1202 commits

Author SHA1 Message Date
Simey Lameze
f2e981e869 MDL-59383 core_calendar: css fixes to summary modal body 2017-07-12 18:56:14 +08:00
Simey Lameze
d4a87aa370 MDL-59383 core_modal: trigger event on modal module 2017-07-12 18:28:11 +08:00
Simey Lameze
19ab239f18 MDL-59383 core_calendar: change modal body rendering 2017-07-12 15:00:30 +08:00
Simey Lameze
f405284728 MDL-59383 core_calendar: proper handling of description on webservice 2017-07-12 15:00:29 +08:00
Simey Lameze
6133141798 MDL-59383 core_calendar: css fixes to summary modal body 2017-07-12 15:00:29 +08:00
David Monllao
93f2056000 Merge branch 'wip-MDL-59441-master' of git://github.com/marinaglancy/moodle 2017-07-11 11:41:03 +02:00
Simey Lameze
0d38888e2a MDL-59383 core_calendar: make event summary display on modal 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00
Simey Lameze
5813d1b9f9 MDL-59383 core_calendar: add get_calendar_event_by_id webservice 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00
Simey Lameze
68c3e21a89 MDL-59383 core_calendar: create summary modal templates 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00
Simey Lameze
dfdde9ad35 MDL-59383 core_calendar: create summary modal AMD module 
Part of MDL-59333.
 2017-07-11 15:36:29 +08:00
Simey Lameze
385a56e33c MDL-59383 core_calendar: create calendar repository AMD module 
Part of MDL-59333.
 2017-07-11 15:36:28 +08:00
Simey Lameze
3b0738f04c MDL-59383 core_calendar: create main calendar AMD module 
Part of MDL-59333.
 2017-07-11 15:36:28 +08:00
Marina Glancy
5540c0979b MDL-59441 calendar: unittest fix for modules without generators 2017-07-04 11:16:08 +08:00
Mark Nelson
2fe7f706d7 MDL-59304 core_calendar: check if course is hidden in bailout callback 2017-07-04 10:11:34 +08:00
David Monllao
1243fce158 Merge branch 'wip-MDL-59308-master' of git://github.com/marinaglancy/moodle 2017-06-27 16:41:26 +02:00
Eloy Lafuente (stronk7)
139648e5bd Merge branch 'MDL-40818-master' of git://github.com/junpataleta/moodle 2017-06-27 01:50:28 +02:00
Jun Pataleta
390098fa64 MDL-1322 calendar: Add course short name in calendar event 
* Add the course's short name for a course event in order to let the
user know immediately which course an event belongs to. Particularly
helpful for activity events.
 2017-06-26 13:37:39 +08:00
Jun Pataleta
fb1a615dfe MDL-40818 calendar: Require login to calendar pages 
* Make sure that the course ID being passed points to an existing course
* Require user to login before granting access to calendar pages.
 2017-06-23 09:20:32 +08:00
Marina Glancy
70b6230829 MDL-59308 calendar: pass module context when known 
this will protect us from exceptions when context for removed instance can not be retrieved
 2017-06-22 13:42:22 +08:00
Marina Glancy
63e9e38202 MDL-58911 calendar: use the same callbacks in unittests and prod 
Remove unittest-specific callbacks for checking access and displaying
the calendar events on the dashboard.

This will allow plugin developers unittest the full behavior
of how their plugins add events to the dashboard.

Reset all static caches between unittests.
 2017-06-20 16:13:35 +08:00
Jun Pataleta
51807cf5c4 MDL-59101 calendar: Properly calculate expected until date 2017-06-07 23:09:17 +08:00
Dan Poltawski
67c70db593 Merge branch 'MDL-59093-master' of git://github.com/junpataleta/moodle 2017-05-31 11:09:06 +01:00
Jun Pataleta
723742fee0 MDL-59093 calendar: Use a fixed start day for forever BYMONTH test 2017-05-31 15:01:34 +08:00
Jake Dallimore
ea1676f761 Merge branch 'MDL-54887-master' of git://github.com/junpataleta/moodle 2017-05-31 08:35:05 +08:00
Dan Poltawski
1a07f9f037 Merge branch 'MDL-58997-group-names-multilang' of https://github.com/lucaboesch/moodle 2017-05-30 16:53:06 +01:00
Luca Bösch
29b83cbb34 MDL-58997 calendar: Group names passing multilang filters. 2017-05-30 16:42:52 +02:00
Dan Poltawski
a8aa1a0362 Merge branch 'MDL-59041-master' of git://github.com/junpataleta/moodle 2017-05-30 14:05:13 +01:00
Jun Pataleta
5e0af1da71 MDL-59041 calendar: Make PRODID of exported ics attributed to Moodle 2017-05-30 19:33:01 +08:00
Eloy Lafuente (stronk7)
7ec40aac16 Merge branch 'MDL-58994-master' of git://github.com/cameron1729/moodle 2017-05-30 13:23:29 +02:00
Jun Pataleta
e083ac1cde MDL-54887 calendar: PR fixes 
* Use the calendar_event::description property and format it using
format_text() on it in order to apply the appropriate filters.
* Then use html_to_text() on it to strip the tags and convert the
description to plain text while converting <br> and <p> tags to
line breaks.
 2017-05-30 16:52:12 +08:00
Soon-Systems
231ddd5a8d MDL-54887 calendar: Format summary + description of an event for export 2017-05-30 16:32:36 +08:00
Jun Pataleta
382ac14d1d MDL-59014 calendar: Unescape event URL for the mini calendar 2017-05-23 17:20:31 +08:00
Cameron Ball
919b5c95e6
MDL-58994 core_calendar: Coalesce event sort field 
There are situations where we need to sort events on a field called
"timesort", but sometimes it is not set. So we can fall back to
"timestart" in this case.
 2017-05-19 15:08:05 +08:00
Jun Pataleta
4eec39e2b2 MDL-58723 calendar: Better testing of forever recurring events 
* Change the start date of the parent event to the current date
  for tests that with events that recur forever.
* Limit query results to 100 for events that recur forever that can
  generate more than 100 event records.
 2017-05-16 14:39:53 +08:00
Marina Glancy
cd2c4b8548 MDL-58867 calendar: avoid fatal errors for non-module events 2017-05-10 14:26:14 +08:00
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release 
version = 2017051500 release version
requires= 2017050500 current rc1 version
 2017-05-09 02:58:28 +02:00
Dan Poltawski
3cc5abc163 Merge branch 'wip-MDL-58688-master-c' of git://github.com/marinaglancy/moodle 2017-05-08 10:31:37 +01:00
Jun Pataleta
472cae12a6 Merge branch 'MDL-58518-master' of git://github.com/ryanwyllie/moodle 2017-05-08 15:50:03 +08:00
Jun Pataleta
c3b1178d58 MDL-58810 calendar: Fix rrule_manager issues 
* Set the correct repeat ID for the recurring event
* Unset UUID for 'child' events of recurring events
 2017-05-08 09:49:13 +08:00
Jun Pataleta
bf57bde20d MDL-58810 calendar: Add coverage for UUID in recurring events 2017-05-08 09:33:47 +08:00
Marina Glancy
47a710177a MDL-58688 calendar: retrieve event module without db queries 2017-05-04 16:53:19 +08:00
Andrew Nicols
6628153eb3 Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle 2017-05-04 14:33:27 +08:00
Cameron Ball
eeb27f03bd
MDL-58736 core_calendar: Revert calendar_get_events to 3.2 implementation 
We modified calendar_get_events in a non backwards compatible way
so instead of fixing that, an easier approch is to simply revert
it to the 3.2 implementation. This should be fine since the way
to get events is going to change in an upcomming release, and we
had to swap all occurences of calendar_get_events in core with
calendar_get_legacy_events to make sure the calendar and overview match.
 2017-05-04 12:19:35 +08:00
Jun Pataleta
c9d775fc92 MDL-58803 calendar: Use fully qualified name for call to rrule_manager 2017-05-04 08:58:11 +08:00
Marina Glancy
5900513f75
MDL-58688 calendar: use modinfo to check module availability 2017-05-03 15:07:43 +08:00
Ryan Wyllie
405f8491e5 MDL-58518 calendar: ignore events from courses user not enrolled in 2017-05-02 02:53:25 +00:00
Jake Dallimore
434f31bc12 Merge branch 'MDL-58575-master' of git://github.com/cameron1729/moodle 2017-05-01 12:14:42 +08:00
Cameron Ball
d0dc97bf3a
MDL-58575 core_calendar: Group override tests for same priority 
This patch adds tests for when group override events have the same
priority.
 2017-04-27 19:12:50 +08:00
Cameron Ball
4bd022ed0c
MDL-58575 core_calendar: Properly restrict groups in event vault 
Previously we were not filtering on groups in the event vault
which meant events for all groups would be returned regardless
of which user was passed in.

This resulted in situations where one student would group overrides
for groups they were not in.
 2017-04-27 15:23:53 +08:00
David Monllao
af282469b4 Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle 2017-04-27 15:16:27 +08:00