Eloy Lafuente (stronk7) [Wed, 5 Apr 2017 00:02:03 +0000 (02:02 +0200)]
Merge branch 'scorm-task' of https://github.com/GanitGenius/moodle
Eloy Lafuente (stronk7) [Tue, 4 Apr 2017 23:31:08 +0000 (01:31 +0200)]
Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 4 Apr 2017 22:22:19 +0000 (00:22 +0200)]
Merge branch 'MDL-58055-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 4 Apr 2017 17:01:57 +0000 (19:01 +0200)]
Merge branch 'MDL-55326-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 4 Apr 2017 16:32:13 +0000 (17:32 +0100)]
MDL-55611 upgrade.txt: remove duplicated note
Eloy Lafuente (stronk7) [Tue, 4 Apr 2017 16:23:02 +0000 (18:23 +0200)]
Merge branch 'MDL-55499-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 4 Apr 2017 16:08:35 +0000 (17:08 +0100)]
MDL-55611 upgrade: bump redirect_if_major_update_required
Dan Poltawski [Tue, 4 Apr 2017 16:07:41 +0000 (17:07 +0100)]
Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 4 Apr 2017 16:02:07 +0000 (17:02 +0100)]
MDL-55611 calendar: remove duplicated 'scheduled task stuff'
Simey Lameze [Tue, 4 Apr 2017 03:31:16 +0000 (11:31 +0800)]
MDL-58474 block_myoverview: change step datetime format
Part of MDL-55611 epic.
Simey Lameze [Tue, 4 Apr 2017 02:34:32 +0000 (10:34 +0800)]
MDL-58474 core_calendar: add missing action_event_interface import
Part of MDL-55611 epic.
Mark Nelson [Mon, 3 Apr 2017 06:29:04 +0000 (14:29 +0800)]
MDL-55611 core_calendar: fixed unit tests failing in isolation
Cameron Ball [Mon, 3 Apr 2017 05:25:52 +0000 (13:25 +0800)]
MDL-58442 core_calendar: Better documentation for the container
Part of MDL-55611 epic.
Cameron Ball [Mon, 3 Apr 2017 05:11:17 +0000 (13:11 +0800)]
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.
Cameron Ball [Mon, 3 Apr 2017 04:53:38 +0000 (12:53 +0800)]
MDL-58442 core_calendar: Rename core_container to simply container
core_container was confusing as it looks Frankenstyleish.
Part of MDL-55611 epic.
Simey Lameze [Thu, 30 Mar 2017 01:37:38 +0000 (09:37 +0800)]
MDL-58438 mod_lti: replace step using course overview block
Part of MDL-55611 epic.
Simey Lameze [Thu, 30 Mar 2017 01:18:15 +0000 (09:18 +0800)]
MDL-58438 core_badges: fix behat issues on award badge feature
Part of MDL-55611 epic.
Cameron Ball [Thu, 30 Mar 2017 07:33:13 +0000 (15:33 +0800)]
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.
Ryan Wyllie [Tue, 21 Mar 2017 05:27:39 +0000 (05:27 +0000)]
MDL-58303 theme_boost: change dashboard block breakpoint to xl
Part of MDL-55611 epic.
Jun Pataleta [Tue, 14 Mar 2017 04:56:17 +0000 (12:56 +0800)]
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.
Jun Pataleta [Tue, 14 Mar 2017 04:32:25 +0000 (12:32 +0800)]
MDL-57607 mod_assign: Make assign_refresh_events refresh overrides
Part of MDL-55611 epic.
Mark Nelson [Fri, 31 Mar 2017 03:05:05 +0000 (11:05 +0800)]
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.
Mark Nelson [Thu, 30 Mar 2017 05:57:33 +0000 (13:57 +0800)]
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.
Mark Nelson [Thu, 30 Mar 2017 04:18:32 +0000 (12:18 +0800)]
MDL-58424 core_calendar: moved logic from api.php to lib.php
Also moved related PHPUnit tests.
Part of MDL-55611 epic.
Mark Nelson [Thu, 30 Mar 2017 03:23:08 +0000 (11:23 +0800)]
MDL-58424 core: undeprecated calendar_* functions
Part of MDL-55611 epic.
Ryan Wyllie [Fri, 24 Mar 2017 06:48:02 +0000 (06:48 +0000)]
MDL-58348 block_myoverview: keep paging bar under courses
Part of MDL-55611 epic.
Jun Pataleta [Thu, 30 Mar 2017 02:41:24 +0000 (10:41 +0800)]
MDL-58425 block_myoverview: Add more details to blocks/upgrade.txt
Part of MDL-55611 epic.
Jun Pataleta [Thu, 23 Mar 2017 06:09:46 +0000 (14:09 +0800)]
MDL-58302 block_myoverview: Set fixed height of items in courses view
Part of MDL-55611 epic.
Jun Pataleta [Thu, 23 Mar 2017 08:06:41 +0000 (16:06 +0800)]
MDL-58365 block_myoverview: Show course summary in plain text
Part of MDL-55611 epic.
Jun Pataleta [Thu, 30 Mar 2017 03:46:33 +0000 (11:46 +0800)]
MDL-58441 calendar: Pass $withduration to the correct function
Part of MDL-55611 epic.
Simey Lameze [Mon, 27 Mar 2017 06:45:21 +0000 (14:45 +0800)]
MDL-58207 mod_assign: reword grading due date lang string
Part of MDL-55611 epic.
Mark Nelson [Wed, 29 Mar 2017 09:19:51 +0000 (17:19 +0800)]
MDL-58432 core_calendar: allow event properties to be null
Part of MDL-55611 epic.
Mark Nelson [Wed, 29 Mar 2017 05:33:11 +0000 (13:33 +0800)]
MDL-58423 core_calendar: moved \core_calendar\event class
Part of MDL-55611 epic.
Simey Lameze [Wed, 22 Mar 2017 02:07:27 +0000 (10:07 +0800)]
MDL-57449 block_myoverview: add behat tests for UI
Part of MDL-55611 epic.
Cameron Ball [Mon, 27 Mar 2017 04:39:08 +0000 (12:39 +0800)]
MDL-58396 core_calendar: Fix failing unit test
Part of MDL-55611 epic.
Andrew Nicols [Tue, 28 Mar 2017 00:51:42 +0000 (08:51 +0800)]
MDL-58386 block_myoverview: Mustache tidyup
Part of MDL-55611 epic.
Jun Pataleta [Mon, 27 Mar 2017 04:00:50 +0000 (12:00 +0800)]
MDL-58386 mod_forum: Fixed CI issues
Part of MDL-55611 epic.
Jun Pataleta [Fri, 24 Mar 2017 08:58:33 +0000 (16:58 +0800)]
MDL-58386 mod_workshop: Fixed CI issues
Part of MDL-55611 epic.
Jun Pataleta [Fri, 24 Mar 2017 08:58:54 +0000 (16:58 +0800)]
MDL-58386 calendar: Fixed CI issues
Part of MDL-55611 epic.
Jun Pataleta [Fri, 24 Mar 2017 08:57:58 +0000 (16:57 +0800)]
MDL-58386 core: Fixed CI issues
Part of MDL-55611 epic.
Jun Pataleta [Fri, 24 Mar 2017 08:57:20 +0000 (16:57 +0800)]
MDL-58386 block_myoverview: Fixed CI issues
Part of MDL-55611 epic.
Mark Nelson [Fri, 24 Mar 2017 05:44:20 +0000 (13:44 +0800)]
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.
Mark Nelson [Fri, 24 Mar 2017 04:47:31 +0000 (12:47 +0800)]
MDL-58188 mod_label: fixed call to update_completion_date_event()
Part of MDL-55611 epic.
Cameron Ball [Fri, 24 Mar 2017 05:38:46 +0000 (13:38 +0800)]
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.
Damyon Wiese [Fri, 24 Mar 2017 06:09:53 +0000 (14:09 +0800)]
MDL-55611 calendar: fix calendar_event uses
It was renamed to \core_calendar::event
Damyon Wiese [Fri, 24 Mar 2017 06:02:17 +0000 (14:02 +0800)]
MDL-55611 icons: Remove pix_url
Change to image_url because these are not "pix icons".
Andrew Nicols [Fri, 24 Mar 2017 00:07:13 +0000 (08:07 +0800)]
MDL-58333 core_calendar: Make WS available to Mobile
Part of MDL-55611 epic.
Andrew Nicols [Thu, 23 Mar 2017 07:57:45 +0000 (15:57 +0800)]
MDL-58333 enrol: Include course progress in course listing WS
Part of MDL-55611 epic.
Mark Nelson [Thu, 23 Mar 2017 05:04:45 +0000 (13:04 +0800)]
MDL-58017 mod_quiz: added action event unit tests
Part of MDL-55611 epic.
Mark Nelson [Thu, 23 Mar 2017 05:04:32 +0000 (13:04 +0800)]
MDL-58017 mod_quiz: added action events
Part of MDL-55611 epic.
Damyon Wiese [Fri, 24 Mar 2017 02:04:58 +0000 (10:04 +0800)]
MDL-58087 mod_forum: Fix fragile test
This test was dependant on the randomly generated group names coming back in a
specific order.
Part of MDL-55611 epic.
Cameron Ball [Thu, 23 Mar 2017 09:31:03 +0000 (17:31 +0800)]
MDL-58087 core_calendar: Fix random unit test failure
Part of MDL-55611 epic.
Cameron Ball [Thu, 23 Mar 2017 07:44:12 +0000 (15:44 +0800)]
MDL-58087 core_calendar: Keep legacy implementation of calendar_get_events
The new implementation of calendar_get_events (i.e., \core_calendar\api::get_events)
has a subtly different behaviour. So we need to maintain the existing implementation
in deprecatedlib.
Part of MDL-55611 epic.
Cameron Ball [Wed, 22 Mar 2017 15:42:28 +0000 (23:42 +0800)]
MDL-58087 core_calendar: Unit tests now jam with new vault behaviour
Some unit tests needed to be updated to specify a few extra
bits and pieces on the events to work properly with the
new event vault behaviour.
Part of MDL-55611 epic.
Cameron Ball [Wed, 22 Mar 2017 11:27:11 +0000 (19:27 +0800)]
MDL-58087 core_calendar: Move logic from get_events to the local API
The logic from get_events has now been moved in to our local API
and is used by the event vault to retrieve events, instead of
querying the database directly.
This has the advantage that it deals with overrides and only
returns events for the relevant user.
Part of MDL-55611 epic.
Cameron Ball [Wed, 22 Mar 2017 11:23:05 +0000 (19:23 +0800)]
MDL-58087 core_calendar: Don't pass non action events through our plumbing
The event factory should simply instantiate an event for non action
events and pass only action events through the plumbing.
This way modules implementing the callbacks can be sure that what
is passed in to the callback is actually supposed to be an action event.
Part of MDL-55611 epic.
Cameron Ball [Wed, 22 Mar 2017 10:12:07 +0000 (18:12 +0800)]
MDL-58087 core_calendar: Don't process events not created by modules
Our API infrastructure currently only deals with events created
by course modules. Site, user, etc events can't be dealt with.
Part of MDL-55611 epic.
Cameron Ball [Wed, 22 Mar 2017 09:53:35 +0000 (17:53 +0800)]
MDL-58087 mod_lesson: Apply overrides in event action callback
Part of MDL-55611 epic.
Cameron Ball [Wed, 22 Mar 2017 09:52:15 +0000 (17:52 +0800)]
MDL-58087 mod_assign: Apply overrides in event action callback
Part of MDL-55611 epic.
Cameron Ball [Wed, 22 Mar 2017 09:42:21 +0000 (17:42 +0800)]
MDL-58087 core_calendar: Remove redundant event vault factory
Part of MDL-55611 epic.
Cameron Ball [Wed, 22 Mar 2017 09:07:35 +0000 (17:07 +0800)]
MDL-58087 core_calendar: Set correct ID for repeat event collection
Initially we were only sending "top level" events through our API
i.e., events that can be repeated, but are not repeats themselves.
In the future we will be sending ALL events through our API and int
that situation the ID of the collection needs a small bit of logic
to correctly set the ID of the parent.
Part of MDL-55611 epic.
Marina Glancy [Mon, 20 Mar 2017 08:18:04 +0000 (16:18 +0800)]
MDL-57961 course: change wording of module availability
renamed Visible to Availability and added help strings
AMOS BEGIN
CPY [availability,core_moodle],[modvisible,core_moodle]
CPY [availability,core_moodle],[modvisiblewithstealth,core_moodle]
CPY [availability,core_moodle],[modvisiblehiddensection,core_moodle]
CPY [show,core_moodle],[modshow,core_moodle]
CPY [hide,core_moodle],[modhide,core_moodle]
AMOS END
Dan Poltawski [Tue, 4 Apr 2017 06:51:05 +0000 (07:51 +0100)]
Merge branch 'MDL-12689-master-fix1' of github.com/damyon/moodle
Dan Poltawski [Tue, 4 Apr 2017 05:56:26 +0000 (06:56 +0100)]
Merge branch 'MDL-55941-initialbar-ux' of https://github.com/ilya-catalyst/moodle
Dan Poltawski [Tue, 4 Apr 2017 05:54:07 +0000 (06:54 +0100)]
Merge branch 'MDL-58220-master-fix1' of github.com/damyon/moodle
Andrew Nicols [Tue, 4 Apr 2017 03:48:50 +0000 (11:48 +0800)]
Merge branch 'master' of https://github.com/koennys/moodle
Damyon Wiese [Tue, 4 Apr 2017 03:18:27 +0000 (11:18 +0800)]
MDL-58220 repository_onedrive: standard plugin
Add this plugin to the standard plugin list.
Damyon Wiese [Tue, 4 Apr 2017 02:52:43 +0000 (10:52 +0800)]
MDL-12689 auth: No settings if ldap missing
Andrew Nicols [Tue, 4 Apr 2017 02:43:41 +0000 (10:43 +0800)]
Merge branch 'wip-MDL-41809-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 4 Apr 2017 02:41:22 +0000 (10:41 +0800)]
MDL-48771 mod_quiz: Rebase conflict fix img => .icon
Damyon Wiese [Tue, 4 Apr 2017 02:40:01 +0000 (10:40 +0800)]
MDL-58220 repo: Fix typo in FILE_CONTRLLED_LINK
Andrew Nicols [Tue, 4 Apr 2017 02:37:26 +0000 (10:37 +0800)]
Merge branch 'MDL-48771-squashed' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 4 Apr 2017 02:28:14 +0000 (10:28 +0800)]
MDL-58220 lang: Add / fix lang strings
The refactoring during integration caused some lang string errors.
Colin Chambers [Thu, 2 Feb 2017 14:36:34 +0000 (14:36 +0000)]
MDL-48771 quiz edit: delete mulitiple tidy up & Behat tests
David Monllao [Mon, 3 Apr 2017 22:27:30 +0000 (00:27 +0200)]
MDL-23919 mod_data: completionentries can be null
David Monllao [Mon, 3 Apr 2017 22:14:35 +0000 (00:14 +0200)]
MDL-12689 mod_data: Remove trailing whitespaces
David Monllao [Mon, 3 Apr 2017 22:08:50 +0000 (00:08 +0200)]
Merge branch 'MDL-12689_m33v4' of https://github.com/sbourget/moodle
David Monllao [Mon, 3 Apr 2017 22:07:24 +0000 (00:07 +0200)]
MDL-23919 mod_data: Clean illegal whitespace
Also moving upgrade step below 3.2 mark.
David Monllao [Mon, 3 Apr 2017 21:24:28 +0000 (23:24 +0200)]
Merge branch 'MDL-23919-mod_data-required-entry-completion' of https://github.com/marcusgreen/moodle
Luca Bösch [Sat, 12 Nov 2016 02:36:08 +0000 (03:36 +0100)]
MDL-48771 quiz: Select multiple questions to delete
Upon Moodle 2.8 the option to bulk delete all questions of a quiz
disappeared.
This patch adresses this and reintruduces a bulk action button.
Pushing that button shows a Delete and a Cancel button as well as
two Select all / Deselect all triggers and each and every question
gets a checkbox. The UI is slimmed down and other elements (e.g.
'Repaginate' button and so on) are hidden. Questions can be chosen
and deleted by pushing the Delete button. The bulk action button
is disabled when quiz attempts are present, just like the
'Repaginate' button.
TODO: Behat tests are lacking.
Marina Glancy [Mon, 3 Apr 2017 02:44:32 +0000 (10:44 +0800)]
MDL-23919 mod_data: small corrections to completion form element
Dan Poltawski [Mon, 3 Apr 2017 16:59:34 +0000 (17:59 +0100)]
Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle
Stephen Bourget [Mon, 3 Apr 2017 14:50:09 +0000 (10:50 -0400)]
MDL-12689: convert auth plugins to use settings.php
Eloy Lafuente (stronk7) [Mon, 3 Apr 2017 14:35:50 +0000 (16:35 +0200)]
Merge branch 'MDL-58462-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 3 Apr 2017 14:27:26 +0000 (16:27 +0200)]
Merge branch 'MDL-55459-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Mon, 3 Apr 2017 12:45:59 +0000 (13:45 +0100)]
MDL-37765 install: Fix missinf field definition
Dan Poltawski [Mon, 3 Apr 2017 11:55:07 +0000 (12:55 +0100)]
MDL-37765 block_login: fix whitespace
Dan Poltawski [Mon, 3 Apr 2017 11:41:56 +0000 (12:41 +0100)]
Merge branch 'MDL-58220-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 3 Apr 2017 08:14:46 +0000 (09:14 +0100)]
MDL-37765 version: bump
Dan Poltawski [Mon, 3 Apr 2017 08:13:55 +0000 (09:13 +0100)]
Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle
Andrew Nicols [Mon, 3 Apr 2017 07:38:53 +0000 (15:38 +0800)]
Merge branch 'MDL-50970-master' of git://github.com/jleyva/moodle
Juan Leyva [Fri, 31 Jul 2015 15:16:45 +0000 (17:16 +0200)]
MDL-50970 core_block: New Web Service core_block_get_course_blocks
Jun Pataleta [Mon, 3 Apr 2017 05:48:58 +0000 (13:48 +0800)]
MDL-58462 mod_data: Generate users with different names
* Give test users different first and last names.
* Declare class member variables instead of dynamically assigning them.
* Rename member variable $data to $database since it conflicts with the
private member variable PHPUnit_Framework_TestCase::$data.
* Replace setExpectedException usage with expectException().
Damyon Wiese [Fri, 31 Mar 2017 04:50:11 +0000 (12:50 +0800)]
MDL-58220 repo: Dont expect file info for any file
Some plugins do not implement the file info callback so expect and handle null in this case.
Damyon Wiese [Fri, 31 Mar 2017 03:13:43 +0000 (11:13 +0800)]
MDL-58220 oauth2: Provide template specific help links
E.g. separate pages for Microsoft / Google.
Damyon Wiese [Fri, 31 Mar 2017 02:48:15 +0000 (10:48 +0800)]
MDL-58220 oauth2: Sanity check user pictures
Damyon Wiese [Fri, 31 Mar 2017 02:36:17 +0000 (10:36 +0800)]
MDL-58220 oauth2: Cleanup on user delete
Delete the linked logins for this user account when it is deleted.
Damyon Wiese [Fri, 31 Mar 2017 02:31:53 +0000 (10:31 +0800)]
MDL-58220 oauth2: Don't login as deleted users
Also prevent sesskey error on first page of new logins.
Damyon Wiese [Fri, 31 Mar 2017 02:06:51 +0000 (10:06 +0800)]
MDL-58220 oauth2: Use email as default username
And give better error messages.
Damyon Wiese [Thu, 30 Mar 2017 07:42:41 +0000 (15:42 +0800)]
MDL-58220 onedrive: Add import from skydrive
If the skydrive repo exists - show a button on the config page for the onedrive repo to "steal" all the files
from the other repo and disable it.