797 Commits

Author SHA1 Message Date
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
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
Rajesh Taneja
52f3e060e4
MDL-55091 phpunit: Following has been deprecated.
1. getMock()
2. setExpectedException()
3. checkForUnintentionallyCoveredCode renamed to beStrictAboutCoversAnnotation
4. beStrictAboutTestSize renamed to enforceTimeLimit
5. UnitTestCase class is now fully removed.
2016-07-26 10:11:30 +08:00
Eloy Lafuente (stronk7)
b697ad409b Merge branch 'wip-mdl-55111' of https://github.com/rajeshtaneja/moodle 2016-07-19 02:09:17 +02:00
Rajesh Taneja
d89dc6b123 MDL-55111 behat: Use option which is available everytime for export
recentupcoming option is always available everytime calendar export
is called, rest week and month is optionally shown and may not be
visible. So use recentupcoming event option and export calendar for test
2016-07-10 11:11:31 +08:00
Juan Leyva
833be5e410 MDL-54629 webservice: Change required parameters in external_format_text
component, filearea and itemid are now optional parameters.
In some contexts those parameteres are not necessary because is not
required to do a file rewrite via file_rewrite_pluginfile_urls
2016-06-21 12:16:25 +01:00
Dan Poltawski
d7c9327d48 Merge branch 'MDL-51749-master' of git://github.com/junpataleta/moodle 2016-06-16 09:04:11 +01:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
Juan Leyva
871988b0b4 MDL-54049 core_message: Add missing external format text 2016-05-04 12:52:45 +02:00
Nick Phillips
7bdc3ba6e6 MDL-53757 core_calendar: always show whole day's events in 'day' view 2016-04-20 11:34:19 +08:00
Jun Pataleta
3de445bb56 MDL-51749 calendar: Behat tests for calendar export and additional fixes 2016-04-18 15:02:50 +08:00
Alistair Spark
6552198130 MDL-51749 CALENDAR: Add ical export for user or group events 2016-04-16 23:43:23 +01:00
Rajesh Taneja
eb9ca848fa MDL-53381 behat: Replaced chained steps with api.
Behat 3.x doesn't support chained steps and hence
this is first step to get rid of chained steps in core.
2016-04-06 11:32:49 +08:00
Rajesh Taneja
42ad096fdb MDL-46891 Behat: Added support for behat 3 2016-03-11 10:51:15 +08:00
Andrew Nicols
f758ad33e4 MDL-49897 calendar: mktime => usergetmidnight 2016-03-09 13:18:09 +08:00
Andrew Nicols
540394e1db Merge branch 'MDL-49897' of https://github.com/rushi963/moodle 2016-03-08 15:05:50 +08:00
Juan Leyva
39b8513763 MDL-52808 calendar: Do not return events for hidden activities 2016-03-07 22:36:31 +01:00
Rushikesh
f68d8a4151 MDL-49897 Calendar : Calendar day view showing past events 2016-03-01 20:05:51 +05:30
David Balch
02c8a8366b MDL-53027 calendar: Fix false empty result from calendar_get_events(). 2016-02-24 18:38:25 +08:00
Stephen Bourget
a721339193 MDL-52383 Calendar: Allow users to set lookahead to 1 year 2016-01-15 13:14:56 -05:00
Adrian Greeve
03af7e696e MDL-52697 calendar: Fixed notice for $name not being defined. 2016-01-08 11:42:20 +08:00
Juan Segarra Montesinos
6349d1e062 MDL-52258 calendar: show event duration on block
Add class .duration_finish to days when an event with duration
finishes. Removes the .muted class from weekend days. Adds
$daytime for the popup title. Tests duyrationbyday too in order
to report no events for a day. Adds endtime suffix to the finish
date of an event with duration.
2016-01-04 09:40:13 +01:00
Ryan Wyllie
4f2ff25ed1 MDL-52258 calendar: show event duration on block
Highlight the days on the calendar for the entire duration
of the event, not just the start day. The days are highlighted
with the same colour as the starting day and will also show
the event popup on hover.
2015-12-10 11:17:25 +01:00
Eloy Lafuente (stronk7)
fdca1a1dd3 Merge branch 'MDL-51495' of https://github.com/NeillM/moodle 2015-11-11 16:56:27 +01:00
Neill Magill
f11fdf9c98 MDL-51495 calendar: E_WARNING in core_calendar_get_calendar_events
If a user does not have the 'moodle/calendar:manageentries' capability then an E_WARNING
can be generated by the core_calendar_external::get_calendar_events() method, that an
expected array is null

This patch creates an array that is missing when a user does not have the capability.
2015-11-11 15:24:31 +00:00