mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 06:31:22 +01:00
Code Issues Projects Releases Wiki Activity
96,219 Commits 36 Branches 527 Tags
bf7a6ff4d7
Commit Graph

119 Commits

Author SHA1 Message Date
Adrian Greeve
f00542c485 Merge branch 'MDL-66999-master' of git://github.com/bmbrands/moodle 2019-12-23 14:26:39 +08:00
Shamim Rezaie
f046b70355 MDL-67152 calendar: The day view should start from the current day 2019-12-09 22:37:21 +11:00
Bas Brands
9396731e94 MDL-66999 theme_boost: @extend replace .col-xs-* 
Remove legacy col-xs-* classes. They are changed in upstream
Bootstrap 4 stable with just col-*.
 2019-12-09 10:49:39 +01:00
David Matamoros
21ad9531d0 MDL-66354 core_calendar: Notices in error.log on calendar events 2019-09-25 09:08:41 +02:00
Simey Lameze
7bfe4a52a3 MDL-66012 calendar: fix no event message on calendar views 
Ahhh Jun. Thanks legend :)
 2019-07-10 11:34:35 +08:00
Simey Lameze
e5ab472810 MDL-65671 calendar: add event listener to three month block 2019-06-12 15:54:25 +08:00
Simey Lameze
fed1cc738d MDL-65671 calendar: tidy up calendar header 2019-06-12 15:54:24 +08:00
Simey Lameze
859bc931d8 MDL-65671 calendar: remove course selector label from exporters 2019-06-12 15:54:24 +08:00
Simey Lameze
4cc9d7c83a MDL-65671 calendar: add listener to day link in month view 2019-06-12 15:54:12 +08:00
Simey Lameze
dbccdae8f5 MDL-65671 calendar: add the calendar view selector 2019-06-10 13:09:57 +08:00
David Matamoros
79b9f905b1 MDL-65699 core_calendar: Check string exists for event types 2019-05-23 17:21:27 +02: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
a67bbe5039 MDL-65318 core_calendar: make event details consistent across pages 2019-05-02 08:05:06 +08:00
Simey Lameze
0ea03be795 MDL-65318 core_calendar: add event details template 2019-05-02 08:05:02 +08:00
Mathew May
5db1ce5331 MDL-64506 templates: BS2 pull-x -> BS4 float-x 2019-04-03 19:47:13 +08:00
Mathew May
5cac5fa428 MDL-64506 templates: BS2 m-x-x to BS4 mx-x 2019-04-03 19:47:11 +08:00
Mathew May
5638b57267 MDL-58428 theme: Move templates from calendar 2019-02-26 12:56:14 +01:00
Simey Lameze
b8c0534515 MDL-63999 calendar: double escape event name on templates 2018-11-16 13:56:54 +08: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
ef4e04ee26 MDL-37624 calendar: Added location support 2018-06-29 10:46:54 +08:00
Bas Brands
3ec69c2ece MDL-56511 theme_boost: Update to Bootstrap 4 stable 
Behat fixes by David Monllao <davidm@moodle.com>
    - Blocks
    - Modals
    - Messaging styling
    - Breadcrumb
    - Pagination
    - Course & categories management
 2018-04-18 09:31:53 +08:00
Guillermo Alvarez
8669d43a96 MDL-61673 calendar: Replace wrong string on mustache template 2018-04-02 10:32:07 -05:00
Ryan Wyllie
60908b2187 MDL-60967 calendar: only load course filter when required 2018-01-09 05:57:38 +00:00
Jun Pataleta
60236650d6 Merge branch 'MDL-60962-master' of git://github.com/ryanwyllie/moodle 2018-01-03 16:53:49 +08:00
Simey Lameze
39cda40590 MDL-61055 calendar: guest user cannot create events 2017-12-19 16:30:08 +08:00
Ryan Wyllie
7884ecf24f MDL-60962 block_calendar_month: load content after page render 2017-12-06 06:21:16 +00: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
Jake Dallimore
eaa43a132c Merge branch 'MDL-60700-master' of git://github.com/ryanwyllie/moodle 2017-11-07 14:23:50 +08:00
Ryan Wyllie
f0fc8a194a MDL-60700 calendar: remove bottom margin for description in summary 2017-11-07 06:03:01 +00:00
Andrew Nicols
03561ea899 Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle 2017-11-07 13:49:47 +08:00
Ryan Wyllie
6688ae2ba2 MDL-60062 calendar: prevent drag and drop of override events 2017-11-07 05:47:18 +00:00
Ryan Wyllie
8926030555 MDL-60700 calendar: normalise event type in summmary modal render 2017-11-07 02:08:00 +00:00
David Monllao
be88f0993d Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle 2017-11-06 21:45:14 +01:00
Simey Lameze
20a5056df6 MDL-60638 calendar: fix event subscription variable names 2017-11-03 10:03:17 +08:00
Damyon Wiese
f18fb611c9 Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle 2017-11-02 15:46:42 +08:00
Andrew Nicols
43caf0217f MDL-60558 block_calendar_upcoming: Render the template when no events 2017-11-02 15:43:17 +08:00
Damyon Wiese
41080050b0 Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle 2017-11-02 13:03:35 +08:00
Damyon Wiese
71fc06aae5 Merge branch 'MDL-60645-master' of git://github.com/andrewnicols/moodle 2017-11-02 12:10:04 +08:00
Andrew Nicols
e3491a093a MDL-60558 calendar: Upcoming block should use the right template 2017-11-02 11:55:49 +08:00
Andrew Nicols
a0a78199b8 MDL-60558 calendar: Add event metadata to upcoming template 2017-11-02 11:55:49 +08:00
Damyon Wiese
671440d708 Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle 2017-11-02 11:38:57 +08:00
Andrew Nicols
43a1e9a2a5 MDL-60645 calendar: Add missing clean classes 2017-11-01 09:36:15 +08:00
Ryan Wyllie
4febb36efe MDL-59936 calendar: use icons in event summary modal 2017-10-30 08:33:54 +08:00
Andrew Nicols
a1b696f943 MDL-60576 calendar: Remove underline between icons and text 2017-10-29 21:01:40 +08:00
David Monllao
62a38a4ece Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle 2017-10-26 19:15:44 +02: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
David Monllao
c1c7cb9c42 Merge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle 2017-10-19 09:07:05 +02:00
David Monllao
5d5ebedf56 Merge branch 'MDL-60374-master' of git://github.com/andrewnicols/moodle 2017-10-16 18:26:55 +02:00