mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-25 00:02:18 +02:00
Code Issues Projects Releases Wiki Activity
95,228 Commits 37 Branches 540 Tags
c98f4488662fd301748a4f88893691b51a559cfa
Commit Graph

107 Commits

Author SHA1 Message Date
Adrian Greeve
d053310d6a Merge branch 'MDL-65671-master' of git://github.com/lameze/moodle 2019-06-13 18:04:49 +02:00
Simey Lameze
859bc931d8 MDL-65671 calendar: remove course selector label from exporters 2019-06-12 15:54:24 +08:00
Simey Lameze
dbccdae8f5 MDL-65671 calendar: add the calendar view selector 2019-06-10 13:09:57 +08:00
Simey Lameze
6b2fca2f3d MDL-65703 calendar: do not add course param for site calendar 2019-06-04 19:33:45 +08:00
David Matamoros
79b9f905b1 MDL-65699 core_calendar: Check string exists for event types 2019-05-23 17:21:27 +02:00
Andrew Nicols
370acc305f Merge branch 'MDL-65262-master' of git://github.com/lameze/moodle 2019-05-03 10:02:18 +08:00
Jun Pataleta
ab709ed274 MDL-65318 core_calendar: Additional fixes 
* Move 'calendareventtype' property to event_exporter_base and
  rename it to 'normalisedeventtype'
* Add a 'normalisedeventtypetext' property to event_exporter_base
  for displaying the human-friendly text for the normalised
  event type.
* Clean up calendareventtype from other exporter/template locations
* Fix template names.
 2019-05-02 14:19:28 +08:00
Simey Lameze
a8dcc212be MDL-65262 core_calendar: change location param type 2019-05-02 11:29:42 +08:00
Simey Lameze
a67bbe5039 MDL-65318 core_calendar: make event details consistent across pages 2019-05-02 08:05:06 +08:00
Shamim Rezaie
b0e5f22961 MDL-62960 calendar: Visuall indicator for valid course event drop zones 2018-10-16 12:58:25 +11:00
Shamim Rezaie
084d5ee46c MDL-62960 calendar: Rename get_module_timestamp_min/max_limit methods 
The methods get_module_timestamp_min_limit() and get_module_timestamp_max_limit()
are doing generic stuff and can be used for other calendar event types as well.
I have renamed them to get_timestamp_min_limit() and get_timestamp_max_limit() respectively.
 2018-10-16 12:58:25 +11:00
Tim Schroeder
d2111dbccf MDL-63119 calendar: now showing event end in modal 
When clicking on an event in the month view, a modal opens with
    information about it. That modal did previously only show the start time
    of the event. It now also shows the end (if the event has one).
 2018-09-18 11:40:07 +08:00
Simey Lameze
baedf0662a MDL-62944 calendar: Fix actionevent logic on template 
During the calendar work, we have added the feature of
drag and drop activity event or "action events".

The problem at that time was, action events could not be
editable through the calendar UI, but should be allowed
to drag and drop. So, we couldn't use the return of
calendar_edit_event_allowed() because it can return true
(in case of teachers, that have permission to change the
activity) and the attribute isactionevent was created to
control on the UI if the user is viewing an action event.

So what my patch does is just add the check if we are
viewing an action event, and in this case, it won't display
the cog to edit that event.
 2018-08-31 10:15:37 +01:00
Michael Hawkins
9a3ee0c396 MDL-37624 calendar: string and behat testing fixes 2018-06-29 10:46:57 +08:00
Michael Hawkins
ef4e04ee26 MDL-37624 calendar: Added location support 2018-06-29 10:46:54 +08:00
David Monllao
09896c35f2 Merge branch 'MDL-60963-master' of git://github.com/ryanwyllie/moodle 2018-01-17 10:49:58 +01:00
Ryan Wyllie
3152de6a8d MDL-60963 calendar: use related cache for module instances in export 2018-01-17 03:23:36 +00:00
David Monllao
abf089f2a3 Merge branch 'MDL-60967-master' of git://github.com/ryanwyllie/moodle 2018-01-16 12:36:27 +01:00
Ryan Wyllie
60908b2187 MDL-60967 calendar: only load course filter when required 2018-01-09 05:57:38 +00:00
Ryan Wyllie
4e6c9ead6d MDL-60959 calendar: remove duplicate events export in weekday 2018-01-09 01:51:13 +00:00
Ryan Wyllie
6b02488559 MDL-60959 calendar: remove duplicate course export in event exporter 2018-01-09 01:51:13 +00:00
Ryan Wyllie
bb4691ec7b MDL-60959 calendar: use related course in calendar_event_exporter 2018-01-09 01:51:12 +00:00
Ryan Wyllie
7884ecf24f MDL-60962 block_calendar_month: load content after page render 2017-12-06 06:21:16 +00:00
Simey Lameze
1a765e32b0 MDL-60823 calendar: use first day of week on prepadding calc 2017-11-17 11:02:39 +08:00
Ryan Wyllie
08b7558483 MDL-60766 block_calendar_upcoming: stop summary modal not logged in 
Stopped the JS from running on the block when the user is not logged in
because it attempts to load a summary modal when an event is clicked on
which results in a failed call to a webservice.
 2017-11-10 02:20:32 +00:00
Ryan Wyllie
6688ae2ba2 MDL-60062 calendar: prevent drag and drop of override events 2017-11-07 05:47:18 +00:00
Ryan Wyllie
478b1d194f MDL-60062 calendar: remove validate_event_timestart callback 2017-11-07 01:25:33 +00:00
Andrew Nicols
30ff29dc9f MDL-60587 calendar: Improve link params for calendar buttons 2017-11-02 21:49:28 +08:00
Andrew Nicols
d523cbcb26 MDL-60558 calendar: Upcoming should support categories 2017-11-02 11:54:43 +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
Damyon Wiese
ef7df2ae0a Merge branch 'MDL-60564_master' of git://github.com/markn86/moodle 2017-10-26 14:43:39 +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
Mark Nelson
72c4cacfa3 MDL-60422 core_calendar: do not lose track of the selected course 2017-10-23 17:18:28 +08:00
David Monllao
7152d2ff7a Merge branch 'MDL-60176-master' of git://github.com/andrewnicols/moodle 2017-10-16 20:02:03 +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
Damyon Wiese
32d641c009 Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle 2017-10-10 17:17:56 +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
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
Simey Lameze
84ad738604 MDL-59751 core_calendar: add calendar_upcoming exporter 2017-10-05 14:23:01 +08:00
Andrew Nicols
d0e56d847a MDL-59890 calendar: Display category events on calendars 2017-10-03 23:22:18 +08:00