mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
83,480 Commits 36 Branches 519 Tags
Commit Graph

820 Commits

Author SHA1 Message Date
Cameron Ball
4c19dc323a MDL-57442 core_calendar: Add missing method to times interface 
Also adds a missing member to event_times implementation.

Part of MDL-55611 epic.
 2017-04-03 11:36:07 +08:00
Mark Nelson
12cbce0aa3 MDL-57888 core_calendar: moved functions from calendar/lib.php 
Part of MDL-55611 epic.
 2017-04-03 11:35:38 +08:00
Cameron Ball
e46efe3a72 MDL-57599 core_calendar: Add action event class 
This patch adds a "regular" calendar event class, and a simple extension
of it which we are calling an action event.

Part of MDL-55611 epic.
 2017-04-03 11:35:38 +08:00
Simey Lameze
f7ce6eab7e MDL-57545 core_calendar: add missing record snapshots 
This commit adds missing add_record_snapshot() calls everywhere calendar_event_updated is triggered.

Part of MDL-55611 epic.
 2017-04-03 11:35:38 +08:00
Simey Lameze
a22fa7cb68 MDL-57545 core_calendar: remove visibility fields from calendar events 
Part of MDL-55611 epic.
 2017-04-03 11:35:38 +08:00
Mark Nelson
c45266d115 MDL-57545 core_calendar: trigger update event when toggling visibility 
Part of MDL-55611 epic.
 2017-04-03 11:35:38 +08:00
Mark Nelson
5019e69588 MDL-57578 core_calendar: removed the function calendar_event_hook() 
Part of MDL-55611 epic.
 2017-04-03 11:33:55 +08:00
Mark Nelson
e057f279e4 MDL-57497 core_calendar: added new calendar event class 
Moved calendar_event class to new location using replaceclasses.php

Part of MDL-55611 epic.
 2017-04-03 11:33:55 +08:00
Damyon Wiese
3e6adcd69c MDL-40759 icons: Rename activity_icon 
image_icon is a better name because there are some valid uses for these other than for activity icons.

E.g. Old JS code that is not worth re-writing.
 2017-03-17 15:52:18 +08:00
Damyon Wiese
663640f5b3 MDL-40759 icons: convert uses of pix_url to pix_icon 
Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.
 2017-03-17 15:52:17 +08:00
Jun Pataleta
02edbe1e30 MDL-57658 calendar: Remove BYDAY filtering dependence on NumberFormatter 2017-03-15 14:18:27 +08:00
Jun Pataleta
620ffacea1 MDL-57658 calendar: Set sort order for fetched DB records 2017-03-15 11:18:21 +08:00
Dan Poltawski
bcd510e36d Merge branch 'MDL-57658-master-3' of git://github.com/junpataleta/moodle 2017-03-14 16:06:19 +00:00
Andrew Nicols
815c6b203f MDL-51853 calendar: Whitespace fix 2017-03-13 09:18:07 +08:00
Andrew Nicols
4c6edf9dd8 Merge branch 'MDL-51853_m33v3' of https://github.com/sbourget/moodle 2017-03-13 08:40:45 +08:00
Marina Glancy
6e65554ea1 MDL-58010 user: allow to update only whitelisted user preferences 2017-03-10 18:04:47 +00:00
Andrew Nicols
5286837617 Merge branch 'MDL-55956-master-5' of git://github.com/junpataleta/moodle 2017-03-10 18:04:46 +00:00
Eloy Lafuente (stronk7)
d8a70ba35f Merge branch 'MDL-57557-master' of git://github.com/danpoltawski/moodle 2017-03-10 18:03:53 +00:00
Jun Pataleta
8ddc656739 MDL-57658 calendar: Fix rrulemanager and unit tests 
Issues fixed:
* Additional rule validations.
* Rewrote recurrence logic.
* Additional unit tests, especially from the examples in the RFC.
* The date format "YmdThis" results into an incorrect date for the
  "UNTIL" parameter. The literal "T" should be escaped, and a literal
  "Z" is also needed at the end of the format string to indicate UTC.
* Implemented handling of negative modifier values for BYxxx rules.
* Implemented handling of BYWEEKNO, BYYEARDAY, BYSETPOS, BYHOUR,
  BYMINUTE, BYSECOND rules.
 2017-03-09 16:10:08 +08:00
Jun Pataleta
f113169573 MDL-55956 calendar: Include courses parameter in subquery conditions 2017-03-08 15:30:04 +08:00
Jun Pataleta
f52459bbbe MDL-55956 calendar: Show only one of duplicate events relevant to user 
If there are multiple, non-repeating events with the same module name,
instance and event type. The most specific event or the event with the
highest priority will be shown.
The ordering of event priorities:
  User override events > Group override events > Course events.
If there are no user override events and there are multiple group
overrides for an event, then the one with the highest priority will be
shown.
 2017-03-07 11:33:17 +08:00
Jun Pataleta
ca75ec4fe0 MDL-55956 db: Add priority column for event table 
* New priority column in order to enable the rendering of a single,
relevant calendar event for a module that has user/group overrides.
* Insert refresh_mod_calendar_events_task record to task_adhoc
table to upgrade existing calendar events for mod plugins via cron
after upgrade process.
 2017-03-06 16:15:26 +08:00
Stephen Bourget
c3feaf269e MDL-51853 calendar: allow entries imported from a file to be updated. 2017-02-28 10:14:25 -05:00
Dan Poltawski
ddc1306c97 MDL-57557 calendar: remove YUI module 2017-02-17 14:05:30 +00:00
Dan Poltawski
6e24853aa1 MDL-57557 calendar: convert from yui module to bootstrap popovers 2017-02-17 14:05:29 +00:00
Eloy Lafuente (stronk7)
777361983c Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:42:29 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors 2017-01-03 09:12:54 +08:00
Dan Poltawski
5fd78ba412 MDL-57532 calendar: tidy up button grouping 2017-01-02 10:44:35 +00:00
Stephen Bourget
d1ee1e5f55 MDL-57532 calendar: Add missing bootstrap classes 2016-12-26 11:33:35 -05:00
Dan Poltawski
988a031a61 Merge branch 'MDL-54996_m33v1' of https://github.com/sbourget/moodle 2016-12-20 09:19:23 +00:00
Stephen Bourget
ef36d240c1 MDL-54996 Calendar: Fix dates for future multi-day events 
Thanks to Martin Cunliffe for providing the fix
 2016-12-17 09:48:41 -05:00
Stephen Bourget
455835809d MDL-55715 calendar: Only update events from the current subscription 
The iCal import should only update calendar events from the current
subscription not any subscription that contains the same event.
 2016-12-13 21:36:08 -05:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release 
version = 2016120500 release version
requires= 2016112900 current rc4 version
 2016-11-29 22:57:05 +01:00
David Monllao
b35c209d76 MDL-56551 calendar: Update behat test according to DOM changes 2016-11-25 10:06:36 +08:00
Damyon Wiese
48489fb93a MDL-56551 calendar: cibot fixes from this issue 2016-11-23 11:25:57 +08:00
Damyon Wiese
7ee4a28719 MDL-56551 calendar: Events list fixes for boost 
The events list is now a list of cards with headers.
Spacing and layout is now done with bootstrap utility classes.
The existing classes were kept - and the styles for bootstrapbase are not changed much.
Also calendar colours can be overridden from a preset.
 2016-11-23 11:25:52 +08:00
Dan Poltawski
757aef2334 MDL-56766 calendar: improve calendar export labels 2016-11-09 17:00:05 +00:00
Adrian Greeve
cbbca0d00f MDL-56120 Calendar: Unit tests for getting events. 
Added a unit test for checking that calendar_get_events
will only return events for activated activities.
 2016-11-07 16:48:16 +08:00
Adrian Greeve
7a33494d71 MDL-56120 calendar: Fix disabled modules showing events. 
calendar_get_events now checks for disabled activities
and only shows events for active modules.
 2016-11-07 16:47:14 +08:00
Damyon Wiese
ba5c5083c5 MDL-55074 theme_boost: Behat fixes for latest theme changes 
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
 2016-10-21 16:06:54 +08:00
Dan Poltawski
bc33e9bd3f MDL-55168 css: reformat plain css with stylefmt 2016-09-30 09:25:23 +01:00
Eloy Lafuente (stronk7)
d0deb28c24 Merge branch 'MDL-55804_master' of git://github.com/dmonllao/moodle 2016-09-29 01:14:33 +02:00
David Monllao
80180e0f92 MDL-55804 forms: Return exported data through _prepareValue 2016-09-27 08:11:56 +08:00
Frederic Massart
525ef9c8b4 MDL-51948 core: Patch core areas for LTR forms 
Part of MDL-55071
 2016-09-23 10:55:14 +01:00
Frederic Massart
ed7844b5f4 MDL-55224 theme_noname: RTL adjustments for auto-flipping era 
Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Eloy Lafuente (stronk7)
ed55d47d03 Merge branch 'wip-MDL-55123-master' of git://github.com/marinaglancy/moodle 2016-09-12 19:37:40 +02:00
Marina Glancy
64c45a2928 MDL-55123 forms: correctly create elements in unittests 2016-09-12 11:56:04 +08:00
Stephen Bourget
9629790b1b MDL-52798 calendar: Move calendar preferences to a user preferences page 
This is based on the work of Shamim Rezaie and will also resolve
MDL-52375 and MDL-50378
 2016-09-06 21:29:34 -04:00
Stephen Bourget
756e3c55c0 MDL-44369 Calendar: add events for subscriptions 2016-07-29 08:56:20 -04:00
David Monllao
837cec00f9 Merge branch 'wip-mdl-55091-m' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
 2016-07-26 10:14:30 +08:00