Damyon Wiese
3192438075
Merge branch 'MDL-60763-master' of git://github.com/andrewnicols/moodle
2017-11-10 13:47:05 +08:00
Andrew Nicols
41b7375c07
MDL-60763 core_calendar: Deprecate calendar_get_upcoming
2017-11-10 13:45:32 +08:00
Jun Pataleta
cfbc820e1b
Merge branch 'MDL-60766-master' of git://github.com/ryanwyllie/moodle
2017-11-10 17:02:41 +13: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
Eloy Lafuente (stronk7)
ba854606e6
MDL-60764 versions: bump all versions and requires near release
...
version = 2017111300 release version
requires= 2017110800 current rc2 version
2017-11-10 02:52:53 +01:00
Andrew Nicols
6996fbaa0e
MDL-60763 core_calendar: Revert removal of calendar_get_upcoming
...
Revert "MDL-60092 core_calendar: remove unused calendar_get_upcoming method"
This reverts commit 4259387ebb
2017-11-10 08:11:36 +08:00
Simey Lameze
754016ab33
MDL-60628 calendar: amend web service unit test
2017-11-09 11:43:49 +08:00
Simey Lameze
10c17dcc10
MDL-60628 calendar: support category events on get_calendar_events ws
2017-11-09 11:29:07 +08:00
João Umberto Ciocca de Almeida
6bc8a2e11f
MDL-60654 calendar: Clean up lines 140-154
...
The if+switch code between lines 140 and 154, even though they selected 3 different choices, all of them gave the same result.
Therefore, it'd be cleaner to replace those 16 lines for just two.
2017-11-08 18:36:03 -02:00
Andrew Nicols
2e36c42625
MDL-60700 calendar: Update behat test or new normal
2017-11-08 10:13:20 +08: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
Ryan Wyllie
478b1d194f
MDL-60062 calendar: remove validate_event_timestart callback
2017-11-07 01:25:33 +00:00
Jun Pataleta
3a0951f027
Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
2017-11-07 13:37:52 +13:00
Andrew Nicols
7d416f9c2c
MDL-60361 calendar: Update behat test lang
2017-11-07 08:36:29 +08:00
Jun Pataleta
8001199766
MDL-60611 calendar: Remove usage of deprecated setExpectedException()
2017-11-07 11:21:29 +13:00
David Monllao
be88f0993d
Merge branch 'MDL-60638-master' of git://github.com/lameze/moodle
2017-11-06 21:45:14 +01:00
Andrew Nicols
f3743b3041
Merge branch 'MDL-60626-master' of git://github.com/damyon/moodle
2017-11-06 12:43:24 +08:00
Damyon Wiese
30890c2971
MDL-60626 calendar: Fix for overrides
...
Override events do not have the courseid so we need to get it from the module instance.
2017-11-06 12:21:27 +08:00
Damyon Wiese
9e0884d410
MDL-60626 calendar: Unit tests for capabilities
...
Check various calendar external functions for capabilities.
2017-11-06 11:11:28 +08:00
Damyon Wiese
af25b8fc7f
MDL-60626 calendar: Check capabilities for api
...
All external functions must check all capabilities before returning data.
The calendar API itself does not check capabilities (I wish it did), so we must be
careful exposing these functions to webservices.
2017-11-06 11:11:28 +08:00
Jake Dallimore
eb354bdefa
Merge branch 'MDL-60361-master' of git://github.com/andrewnicols/moodle
2017-11-06 09:29:46 +08:00
Andrew Nicols
b9fd516407
MDL-60361 calendar: Support all event types for calendar subs
2017-11-03 11:27:40 +08:00
Simey Lameze
20a5056df6
MDL-60638 calendar: fix event subscription variable names
2017-11-03 10:03:17 +08:00
Andrew Nicols
6630b38c95
MDL-60587 calendar: Adjust use of time() in unit tests
2017-11-03 09:04:10 +08:00
Andrew Nicols
e20752c4f5
MDL-60587 calendar: Fix un-validated params
2017-11-02 21:49:28 +08:00
Andrew Nicols
30ff29dc9f
MDL-60587 calendar: Improve link params for calendar buttons
2017-11-02 21:49:28 +08:00
Andrew Nicols
6607c5ffb6
MDL-60587 calendar: Switch WS to use new helper
2017-11-02 21:49:28 +08:00
Andrew Nicols
7f14def230
MDL-60587 calendar: Add missing categoryid in upcoming WS
2017-11-02 21:49:28 +08:00
Andrew Nicols
39e364515f
MDL-60587 calendar: Switch to new helper in main view
2017-11-02 21:49:28 +08:00
Andrew Nicols
57e8c9f748
MDL-60587 calendar: Correct category subscription in information
2017-11-02 21:49:28 +08:00
Andrew Nicols
7b7bf31d4c
MDL-60587 calendar: Add helper to setup the calendar_information
2017-11-02 21:49:28 +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
Andrew Nicols
d523cbcb26
MDL-60558 calendar: Upcoming should support categories
2017-11-02 11:54:43 +08:00
Andrew Nicols
5c9acb8164
MDL-60558 calendar: Adjust URL change
...
The URL change belongs in the calendar_view, not the view_manager.
The view_manager is responsibe for updating the view, not for the
resultant actions from it.
This also changes to use pushState so as not to overwrite the current
location in history.
2017-11-02 11:54:13 +08:00
Andrew Nicols
8242027da3
MDL-60558 calendar: Move edit event to CRUD
2017-11-02 11:53:52 +08:00
Andrew Nicols
fd2f1ae146
MDL-60558 calendar: Remove old SELECTORS
2017-11-02 11:53:49 +08:00
Andrew Nicols
c8419f87c0
MDL-60558 calendar: Harden event link detection
2017-11-02 11:53:26 +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
6c3f463dbd
MDL-60558 calendar: Move the summary modal to view_manager
2017-11-02 10:56:00 +08:00
Andrew Nicols
0df5c743ad
MDL-60361 calendar: Make eventtype functionality a trait
2017-11-02 07:57:44 +08:00
Andrew Nicols
43a1e9a2a5
MDL-60645 calendar: Add missing clean classes
2017-11-01 09:36:15 +08:00
