83810 Commits

Author SHA1 Message Date
Damyon Wiese
a647e7d762 MDL-58220 oauth2: missing param confirmtokenexpires 2017-04-05 14:42:22 +08:00
Damyon Wiese
6cee96c8af MDL-58220 oauth2: obey $CFG->authpreventaccountcreation 2017-04-05 12:52:32 +08:00
Andrew Nicols
04056e715b Merge branch 'MDL-51998_master' of https://github.com/nadavkav/moodle 2017-04-05 09:56:29 +08:00
Jun Pataleta
458315f857 Merge branch 'MDL-57821-master' of git://github.com/jleyva/moodle 2017-04-05 09:39:02 +08:00
Jake Dallimore
170a8b3ec4 Merge branch 'MDL-58368-master' of git://github.com/damyon/moodle 2017-04-05 09:33:45 +08:00
Eloy Lafuente (stronk7)
e58654f452 Merge branch 'scorm-task' of https://github.com/GanitGenius/moodle 2017-04-05 02:02:03 +02:00
Eloy Lafuente (stronk7)
aa2b5b214d Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle 2017-04-05 01:31:08 +02:00
Eloy Lafuente (stronk7)
a2c15cc5a2 Merge branch 'MDL-58055-master' of git://github.com/andrewnicols/moodle 2017-04-05 00:22:19 +02:00
Eloy Lafuente (stronk7)
4c9919fb15 Merge branch 'MDL-55326-master' of git://github.com/andrewnicols/moodle 2017-04-04 19:01:57 +02:00
Dan Poltawski
67aaf4eeda MDL-55611 upgrade.txt: remove duplicated note 2017-04-04 17:32:13 +01:00
Eloy Lafuente (stronk7)
fc96fac29e Merge branch 'MDL-55499-master' of git://github.com/andrewnicols/moodle 2017-04-04 18:23:02 +02:00
Dan Poltawski
6ebb0947f0 MDL-55611 upgrade: bump redirect_if_major_update_required 2017-04-04 17:08:35 +01:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Dan Poltawski
14286ebd4a MDL-55611 calendar: remove duplicated 'scheduled task stuff' 2017-04-04 17:02:07 +01:00
Simey Lameze
5342a54159 MDL-58474 block_myoverview: change step datetime format
Part of MDL-55611 epic.
2017-04-04 11:01:58 +01:00
Simey Lameze
53cbac18ba MDL-58474 core_calendar: add missing action_event_interface import
Part of MDL-55611 epic.
2017-04-04 11:01:57 +01:00
Mark Nelson
d7bc2c6fd5 MDL-55611 core_calendar: fixed unit tests failing in isolation 2017-04-04 11:01:57 +01:00
Cameron Ball
c28f1077c4 MDL-58442 core_calendar: Better documentation for the container
Part of MDL-55611 epic.
2017-04-04 11:01:57 +01:00
Cameron Ball
92ac08bcee MDL-58442 core_calendar: Nuke action_event_factory and friends
These are unecessary since the only place the factory
is used is in the container.

Part of MDL-55611 epic.
2017-04-04 11:01:56 +01:00
Cameron Ball
d10693cb63 MDL-58442 core_calendar: Rename core_container to simply container
core_container was confusing as it looks Frankenstyleish.

Part of MDL-55611 epic.
2017-04-04 11:01:56 +01:00
Simey Lameze
e77830f2e3 MDL-58438 mod_lti: replace step using course overview block
Part of MDL-55611 epic.
2017-04-04 11:01:56 +01:00
Simey Lameze
7698ecb2c0 MDL-58438 core_badges: fix behat issues on award badge feature
Part of MDL-55611 epic.
2017-04-04 11:01:55 +01:00
Cameron Ball
42e76c3f70 MDL-58430 core_calendar: Keep interfaces with implementations
All interfaces have been moved from the interfaces folder such
that they now live with their default implementations.

Part of MDL-55611 epic.
2017-04-04 11:01:55 +01:00
Ryan Wyllie
4265458949 MDL-58303 theme_boost: change dashboard block breakpoint to xl
Part of MDL-55611 epic.
2017-04-04 11:01:54 +01:00
Jun Pataleta
e6661428ad MDL-57607 upgrade: Add post-upgrade adhoc task for refreshing mod events
Insert an ad-hoc task into the task_adhoc table that updates existing calendar
events to convert them to action-type events, where applicable.

Part of MDL-55611 epic.
2017-04-04 11:01:54 +01:00
Jun Pataleta
3651c22b75 MDL-57607 mod_assign: Make assign_refresh_events refresh overrides
Part of MDL-55611 epic.
2017-04-04 11:01:54 +01:00
Mark Nelson
2229368a3c MDL-58424 core_calendar: moved api::get_events
This function was moved to local_api::get_legacy_events.

Also removed the calendar/classes/api.php file since it no longer contained any
functionality and added unit tests for local_api::get_legacy_events (a copy of
the unit tests for calendar_get_events).

Part of MDL-55611 epic.
2017-04-04 11:01:53 +01:00
Mark Nelson
f8443a26f9 MDL-58424 core_calendar: removed unused get_action_events_* functions
Also moved associated unit tests to another location and changed
them so that they were testing local_api instead.

Part of MDL-55611 epic.
2017-04-04 11:01:53 +01:00
Mark Nelson
23a29de7ee MDL-58424 core_calendar: moved logic from api.php to lib.php
Also moved related PHPUnit tests.

Part of MDL-55611 epic.
2017-04-04 11:01:52 +01:00
Mark Nelson
10515e152d MDL-58424 core: undeprecated calendar_* functions
Part of MDL-55611 epic.
2017-04-04 11:01:52 +01:00
Ryan Wyllie
80a1ea5542 MDL-58348 block_myoverview: keep paging bar under courses
Part of MDL-55611 epic.
2017-04-04 11:01:52 +01:00
Jun Pataleta
db3b790920 MDL-58425 block_myoverview: Add more details to blocks/upgrade.txt
Part of MDL-55611 epic.
2017-04-04 11:01:51 +01:00
Jun Pataleta
82afbfab31 MDL-58302 block_myoverview: Set fixed height of items in courses view
Part of MDL-55611 epic.
2017-04-04 11:01:51 +01:00
Jun Pataleta
aac4653365 MDL-58365 block_myoverview: Show course summary in plain text
Part of MDL-55611 epic.
2017-04-04 11:01:51 +01:00
Jun Pataleta
c755cb354c MDL-58441 calendar: Pass $withduration to the correct function
Part of MDL-55611 epic.
2017-04-04 11:01:50 +01:00
Simey Lameze
8d63ed6ed5 MDL-58207 mod_assign: reword grading due date lang string
Part of MDL-55611 epic.
2017-04-04 11:01:50 +01:00
Mark Nelson
2a8e41b990 MDL-58432 core_calendar: allow event properties to be null
Part of MDL-55611 epic.
2017-04-04 11:01:49 +01:00
Mark Nelson
e1cd93ce20 MDL-58423 core_calendar: moved \core_calendar\event class
Part of MDL-55611 epic.
2017-04-04 11:01:49 +01:00
Simey Lameze
1dc764a6d9 MDL-57449 block_myoverview: add behat tests for UI
Part of MDL-55611 epic.
2017-04-04 11:01:48 +01:00
Cameron Ball
71d1430c27 MDL-58396 core_calendar: Fix failing unit test
Part of MDL-55611 epic.
2017-04-04 11:01:48 +01:00
Andrew Nicols
0822417d5e MDL-58386 block_myoverview: Mustache tidyup
Part of MDL-55611 epic.
2017-04-04 11:01:48 +01:00
Jun Pataleta
197b6d9e5a MDL-58386 mod_forum: Fixed CI issues
Part of MDL-55611 epic.
2017-04-04 11:01:47 +01:00
Jun Pataleta
0eb42c8579 MDL-58386 mod_workshop: Fixed CI issues
Part of MDL-55611 epic.
2017-04-04 11:01:47 +01:00
Jun Pataleta
20592f5ff2 MDL-58386 calendar: Fixed CI issues
Part of MDL-55611 epic.
2017-04-04 11:01:47 +01:00
Jun Pataleta
966cbed632 MDL-58386 core: Fixed CI issues
Part of MDL-55611 epic.
2017-04-04 11:01:46 +01:00
Jun Pataleta
775c6bac6d MDL-58386 block_myoverview: Fixed CI issues
Part of MDL-55611 epic.
2017-04-04 11:01:46 +01:00
Mark Nelson
1054c6f879 MDL-58188 mod_assign: added missing require_once and updated docs
The only reason the exclusion of require_once was not exploding before
is because the call to provider_event_action() was being triggered first
which required the file. We can't rely on this happening all the time.

The doc update describes when the usage of is_event_visible() is appropriate.

Part of MDL-55611 epic.
2017-04-04 11:01:45 +01:00
Mark Nelson
de036a2d76 MDL-58188 mod_label: fixed call to update_completion_date_event()
Part of MDL-55611 epic.
2017-04-04 11:01:45 +01:00
Cameron Ball
8d4e0f29dc MDL-58383 core_calendar: Correctly filter in event vault
The filter parameter was being passed in as the wrong argument which
was allowing non action events to be returned.

Part of MDL-55611 epic.
2017-04-04 11:01:45 +01:00
Damyon Wiese
de66ac3cd6 MDL-55611 calendar: fix calendar_event uses
It was renamed to \core_calendar::event
2017-04-04 11:01:44 +01:00