Jake Dallimore [Wed, 19 Apr 2017 07:50:48 +0000 (15:50 +0800)]
Merge branch 'MDL-58520-master' of git://github.com/ryanwyllie/moodle
David Monllao [Wed, 19 Apr 2017 07:44:37 +0000 (15:44 +0800)]
MDL-57456 glossary: Refine patch changes
David Monllao [Wed, 19 Apr 2017 07:42:29 +0000 (15:42 +0800)]
Merge branch 'wip-MDL-57456-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Wed, 19 Apr 2017 05:50:28 +0000 (13:50 +0800)]
Merge branch 'MDL-58536-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Thu, 6 Apr 2017 07:58:13 +0000 (07:58 +0000)]
MDL-58520 block_myoverview: change display name to Course overview
Change the display name of the my overview block to Course overview to
match the block it is replacing (and the UX prototype).
The use of "My" is no longer recommended when naming things in Moodle.
Ryan Wyllie [Fri, 7 Apr 2017 06:29:15 +0000 (06:29 +0000)]
MDL-58536 block_myoverview: use moodle user timezone for midnight calc
Pass the user's midnight timestamp to the javascript to ensure that a
user's timezone is respected when calculating the categories the events
should be placed in on the event list.
Andrew Nicols [Wed, 19 Apr 2017 03:53:40 +0000 (11:53 +0800)]
Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle
Jake Dallimore [Wed, 12 Apr 2017 03:50:43 +0000 (11:50 +0800)]
MDL-58138 completion: Fixes for a number of small issues.
David Monllao [Wed, 19 Apr 2017 03:30:03 +0000 (11:30 +0800)]
Merge branch 'MDL-54901' of git://github.com/stronk7/moodle
Marina Glancy [Wed, 5 Apr 2017 05:04:13 +0000 (13:04 +0800)]
MDL-58138 completion: changes after rebasing
The defaults for the completion have been changed in MDL-55611
Marina Glancy [Mon, 3 Apr 2017 02:45:18 +0000 (10:45 +0800)]
MDL-58460 mod_data: work with bulk completion API
Part of MDL-58138 epic
Jake Dallimore [Mon, 3 Apr 2017 00:56:27 +0000 (08:56 +0800)]
MDL-58460 completion: add callbacks to mod_data for bulk completion
Part of MDL-58138 epic
Marina Glancy [Fri, 31 Mar 2017 06:57:59 +0000 (14:57 +0800)]
MDL-58408 completion: can not require grade if grading is not available
Part of MDL-58138 epic
Jake Dallimore [Fri, 31 Mar 2017 06:32:44 +0000 (14:32 +0800)]
MDL-58138 completion: consolidate bulk edit notifications to single call
Part of MDL-58138 epic
Jake Dallimore [Wed, 29 Mar 2017 06:46:12 +0000 (14:46 +0800)]
MDL-58138 completion: move new lang strings to the completion lang file
Part of MDL-58138 epic
Jake Dallimore [Fri, 24 Mar 2017 06:09:09 +0000 (14:09 +0800)]
MDL-58138 completion: conditional state buttons and css fixes
Part of MDL-58138 epic
Jake Dallimore [Fri, 24 Mar 2017 03:51:45 +0000 (11:51 +0800)]
MDL-58138 completion: rebase on font-awesome changes.
Part of MDL-58138 epic
Jake Dallimore [Tue, 21 Mar 2017 07:09:56 +0000 (15:09 +0800)]
MDL-58138 completion: Assorted linting fixes.
Part of MDL-58138 epic
Jake Dallimore [Thu, 16 Mar 2017 07:27:25 +0000 (15:27 +0800)]
MDL-58138 tests: unit and behat tests covering bulk and default tabs
Part of MDL-58138 epic
Marina Glancy [Tue, 21 Mar 2017 06:11:02 +0000 (14:11 +0800)]
MDL-58267 completion: style and capabilities cleanup
Part of MDL-58138 epic
Marina Glancy [Fri, 17 Mar 2017 07:24:59 +0000 (15:24 +0800)]
MDL-58267 completion: allow to set default activity completion
Part of MDL-58138 epic
Marina Glancy [Wed, 15 Mar 2017 02:35:51 +0000 (10:35 +0800)]
MDL-58139 completion: bulk update completion
Part of MDL-58138 epic
Marina Glancy [Tue, 14 Mar 2017 02:24:06 +0000 (10:24 +0800)]
MDL-58140 completion: access control refinements
Part of MDL-58138 epic
Adrian Greeve [Thu, 9 Mar 2017 06:32:37 +0000 (14:32 +0800)]
MDL-58140 completion: Added form change checker.
Part of MDL-58138 epic
Adrian Greeve [Thu, 9 Mar 2017 03:31:03 +0000 (11:31 +0800)]
MDL-58140 completion: Default completion page.
Part of MDL-58138 epic
Adrian Greeve [Fri, 3 Mar 2017 09:22:25 +0000 (17:22 +0800)]
MDL-58140 completion: Added bulk activity completion page.
Part of MDL-58138 epic
Jake Dallimore [Tue, 7 Mar 2017 09:34:26 +0000 (17:34 +0800)]
MDL-58190 completion: callbacks to get completion rule descriptions
- Activities can have their custom completion rules added to cm_info
through the get_coursemodule_info callback.
- Descriptions of a modules active completion rules can be fetched using
the component callback mod_xxx_get_completion_active_rule_descriptions
which takes in a cm_info object and returns an array of strings.
Part of MDL-58138 epic
David Monllao [Tue, 18 Apr 2017 23:14:43 +0000 (07:14 +0800)]
Merge branch 'MDL-58624-master' of git://github.com/ankitagarwal/moodle
David Monllao [Tue, 18 Apr 2017 22:20:41 +0000 (06:20 +0800)]
Merge branch 'MDL-58631-master-authdoc' of git://github.com/mudrd8mz/moodle
David Monllao [Tue, 18 Apr 2017 21:17:50 +0000 (05:17 +0800)]
Merge branch 'MDL-58096-master' of git://github.com/StudiUM/moodle
David Monllao [Tue, 18 Apr 2017 19:50:44 +0000 (03:50 +0800)]
Merge branch 'MDL-58625-master' of git://github.com/danpoltawski/moodle
Gilles-Philippe Leblanc [Tue, 18 Apr 2017 18:48:26 +0000 (14:48 -0400)]
MDL-58096 reports: Add SQL required by preload_from_record()
Dan Poltawski [Tue, 18 Apr 2017 18:48:35 +0000 (19:48 +0100)]
Merge branch 'wip-MDL-58502-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 18 Apr 2017 18:47:04 +0000 (19:47 +0100)]
Merge branch 'MDL-58526_m33v2' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 18 Apr 2017 17:53:51 +0000 (18:53 +0100)]
Merge branch 'MDL-58463-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 18 Apr 2017 16:49:41 +0000 (00:49 +0800)]
Merge branch 'MDL-58116-master' of https://github.com/barrasroger/moodle-1
David Monllao [Tue, 18 Apr 2017 16:43:02 +0000 (00:43 +0800)]
Merge branch 'MDL-58566-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 18 Apr 2017 15:54:33 +0000 (16:54 +0100)]
Merge branch 'MDL-58629' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 18 Apr 2017 15:47:31 +0000 (16:47 +0100)]
Merge branch 'MDL-58618-master' of https://github.com/xow/moodle
Dan Poltawski [Tue, 18 Apr 2017 15:46:12 +0000 (16:46 +0100)]
Merge branch 'MDL-58374-master-ltierrorlog' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 18 Apr 2017 15:45:09 +0000 (16:45 +0100)]
Merge branch 'MDL-58603-master' of git://github.com/ankitagarwal/moodle
David Mudrák [Tue, 18 Apr 2017 14:23:11 +0000 (16:23 +0200)]
MDL-58631 auth: Clarify documentation of changes in loginpage_idp_list()
This should clarify the new 'iconurl' key returned by the auth plugin's
loginpage_idp_list() method.
Gilles-Philippe Leblanc [Mon, 10 Apr 2017 18:59:39 +0000 (14:59 -0400)]
MDL-58096 reports: Optimize database request
Dan Poltawski [Tue, 18 Apr 2017 11:51:13 +0000 (12:51 +0100)]
MDL-58625 behat: update tool_lp data generator
Dan Poltawski [Tue, 18 Apr 2017 11:34:50 +0000 (12:34 +0100)]
on-demand release 3.3dev+
Dan Poltawski [Tue, 18 Apr 2017 11:34:49 +0000 (12:34 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
barrasroger [Tue, 18 Apr 2017 11:28:08 +0000 (13:28 +0200)]
MDL-58116 core_enrol: fix handling of users on different methods
Eloy Lafuente (stronk7) [Tue, 18 Apr 2017 11:19:37 +0000 (13:19 +0200)]
MDL-58629 install: update the list of stale files for 3.3
Dan Poltawski [Tue, 18 Apr 2017 09:43:05 +0000 (10:43 +0100)]
MDL-58625 competency restore: avoid use of magic gettter
These were deprecated when persistents moved to core.
Ankit Agarwal [Tue, 18 Apr 2017 08:24:45 +0000 (13:54 +0530)]
MDL-58624 persistent: Use correct namespace for exception
Dan Poltawski [Tue, 18 Apr 2017 08:03:58 +0000 (09:03 +0100)]
Merge branch 'MDL-58464-int-fix-2' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Tue, 18 Apr 2017 07:50:41 +0000 (07:50 +0000)]
MDL-58464 block_myoverview: remove additional placeholder in timeline
Remove the additional placeholder image when the user is not enrolled in
any courses from the sort by courses view in the timeline because there
is already a check for no in progress courses.
Dan Poltawski [Tue, 18 Apr 2017 07:15:57 +0000 (08:15 +0100)]
Merge branch 'MDL-58464-int-fix-1' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Tue, 18 Apr 2017 07:03:13 +0000 (07:03 +0000)]
MDL-58464 block_myoverview: fix js error in timeline view courses
Jun Pataleta [Tue, 18 Apr 2017 06:43:57 +0000 (14:43 +0800)]
Merge branch 'MDL-58574-master' of git://github.com/lameze/moodle
Ankit Agarwal [Tue, 18 Apr 2017 06:28:30 +0000 (11:58 +0530)]
MDL-58603 glossary: Fix fontawesome api name
Simey Lameze [Tue, 18 Apr 2017 01:58:55 +0000 (09:58 +0800)]
MDL-58574 templates: remove unnecessary imageurl check
John Okely [Tue, 18 Apr 2017 05:35:01 +0000 (13:35 +0800)]
MDL-58618 auth: Fix idp icon urls
Jun Pataleta [Tue, 18 Apr 2017 05:22:33 +0000 (13:22 +0800)]
MDL-58463 mod_assign: Improve coverage of test_assign_refresh_events()
Jun Pataleta [Wed, 12 Apr 2017 06:01:10 +0000 (14:01 +0800)]
MDL-58566 calendar: Move \core_calendar\local\api::get_legacy_events()
* Move and rename \core_calendar\local\api::get_legacy_events() to
calendar_get_legacy_events() in calendar/lib.php.
* Fix the parameter-normalising callback function in
calendar_get_legacy_events() so that it correctly handles false values
by returning an empty array instead of it returning a non-empty array
that contains an empty element.
Andrew Nicols [Tue, 18 Apr 2017 02:23:03 +0000 (10:23 +0800)]
Merge branch 'MDL-58551-master' of git://github.com/lameze/moodle
Simey Lameze [Tue, 11 Apr 2017 08:06:05 +0000 (16:06 +0800)]
MDL-58551 config: add alternative_file_system_class description
Andrew Nicols [Tue, 18 Apr 2017 01:42:36 +0000 (09:42 +0800)]
Merge branch 'MDL-58559-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Tue, 18 Apr 2017 00:08:03 +0000 (02:08 +0200)]
MDL-54901 phpunit: Change phpunit wwwroot to HTTPS and fix tests
This includes:
- Changing PHPUnit's bootstrap to use https://www...
- Modify all existing expectations to the new wwwroot.
- Amend some tests now with different defaults because of is_https()
- Added a note to main upgrade.php about the change.
Andrew Nicols [Tue, 18 Apr 2017 01:20:10 +0000 (09:20 +0800)]
Merge branch 'MDL-58582-master' of https://github.com/Dagefoerde/moodle
Simey Lameze [Tue, 11 Apr 2017 03:21:38 +0000 (11:21 +0800)]
MDL-58559 block_community: check if the course has subject
Andrew Nicols [Tue, 18 Apr 2017 00:41:59 +0000 (08:41 +0800)]
Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 17 Apr 2017 16:26:36 +0000 (18:26 +0200)]
MDL-54901 travis: ensure pg93 is available and https served
Eloy Lafuente (stronk7) [Mon, 17 Apr 2017 15:27:07 +0000 (17:27 +0200)]
MDL-54901 environment: pg93, openssl, https & utf8mb4
Ruslan Kabalin [Fri, 7 Apr 2017 10:57:35 +0000 (11:57 +0100)]
MDL-58539 assignfeedback_editpdf: Fix group assignment fatal error.
This makes sure that $grade->attemptnumber is not NULL before using its
value.
Jan Dageförde [Wed, 12 Apr 2017 18:36:49 +0000 (20:36 +0200)]
MDL-58582 theme: Improve PHPDoc comment on SVG image resolution
David Monllao [Mon, 17 Apr 2017 12:44:39 +0000 (14:44 +0200)]
Merge branch 'MDL-58478-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 17 Apr 2017 11:17:18 +0000 (12:17 +0100)]
MDL-58486 userprefs: clarifying comment
Dan Poltawski [Mon, 17 Apr 2017 11:15:40 +0000 (12:15 +0100)]
Merge branch 'MDL-58486' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 17 Apr 2017 10:23:52 +0000 (11:23 +0100)]
Merge branch 'MDL-58499-master' of git://github.com/barbararamiro/moodle
Eloy Lafuente (stronk7) [Mon, 17 Apr 2017 10:19:36 +0000 (12:19 +0200)]
MDL-54901 environment: 3.3 base information
This is a direct copy of the 3.2 branch to
have changes under control easier in next commits.
Dan Poltawski [Mon, 17 Apr 2017 10:07:43 +0000 (11:07 +0100)]
Merge branch 'MDL-58549-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 17 Apr 2017 09:59:47 +0000 (10:59 +0100)]
Merge branch 'MDL-58479-33-weblib-notice-phpdoc' of git://github.com/roperto/moodle
Dan Poltawski [Mon, 17 Apr 2017 09:53:42 +0000 (10:53 +0100)]
Merge branch 'MDL-46929' of https://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 17 Apr 2017 09:39:28 +0000 (11:39 +0200)]
MDL-46929 mod_forum: behat fixes
- Keep old scenarios being non-javascript.
- Move the tags stuff to recently added scenario.
- Change some "my" by "your" to avoid problems detecting results
while keeping previous tests (based on "subject") working.
Dan Poltawski [Mon, 17 Apr 2017 09:42:48 +0000 (10:42 +0100)]
Merge branch 'MDL-58507_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 17 Apr 2017 09:41:16 +0000 (10:41 +0100)]
Merge branch 'MDL-58465-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 17 Apr 2017 09:30:32 +0000 (10:30 +0100)]
Merge branch 'MDL-58393-33_filter-order' of https://github.com/roperto/moodle
Dan Poltawski [Mon, 17 Apr 2017 09:03:07 +0000 (10:03 +0100)]
Merge branch 'MDL-58593-master' of git://github.com/merrill-oakland/moodle
Eric Merrill [Thu, 13 Apr 2017 16:21:13 +0000 (12:21 -0400)]
MDL-58593 database: More efficiently track issued key names
Dan Poltawski [Thu, 13 Apr 2017 14:58:00 +0000 (15:58 +0100)]
Merge branch 'MDL-32596_master' of https://github.com/rezaies/moodle
Dan Poltawski [Thu, 13 Apr 2017 14:33:43 +0000 (15:33 +0100)]
Merge branch 'MDL-58085-master' of git://github.com/cameron1729/moodle
Ryan Wyllie [Mon, 3 Apr 2017 06:44:00 +0000 (06:44 +0000)]
MDL-58464 block_myoverview: paginate timeline sort by courses view
David Monllao [Thu, 13 Apr 2017 10:58:23 +0000 (12:58 +0200)]
Merge branch 'MDL-58244-master' of https://github.com/MartinGauk/moodle
David Monllao [Thu, 13 Apr 2017 10:39:44 +0000 (12:39 +0200)]
Merge branch 'MDL-58171-report-role-format_text' of https://github.com/lucaboesch/moodle
Martin Gauk [Mon, 13 Mar 2017 12:49:14 +0000 (12:49 +0000)]
MDL-58244 shibboleth: handle users who are logged out
If the user is (already) logged out, do not access $USER->auth and redirect him to the return URL.
David Monllao [Thu, 13 Apr 2017 09:38:37 +0000 (11:38 +0200)]
Merge branch 'MDL-58560-master' of https://github.com/xow/moodle
David Monllao [Thu, 13 Apr 2017 09:36:54 +0000 (11:36 +0200)]
Merge branch 'MDL-58493-master' of git://github.com/damyon/moodle
Andrew Nicols [Thu, 13 Apr 2017 05:21:42 +0000 (13:21 +0800)]
Merge branch 'MDL-58501_master' of git://github.com/markn86/moodle
Andrew Nicols [Thu, 13 Apr 2017 04:10:45 +0000 (12:10 +0800)]
Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle
Andrew Nicols [Thu, 13 Apr 2017 02:00:58 +0000 (10:00 +0800)]
Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle
Andrew Nicols [Thu, 13 Apr 2017 00:44:15 +0000 (08:44 +0800)]
Merge branch 'MDL-39913-master-new-validation' of https://github.com/xow/moodle
Andrew Nicols [Thu, 13 Apr 2017 00:36:20 +0000 (08:36 +0800)]
Merge branch 'MDL-58537-master' of git://github.com/damyon/moodle
AMOS bot [Wed, 12 Apr 2017 16:03:51 +0000 (00:03 +0800)]
Automatically generated installer lang files
David Monllao [Wed, 12 Apr 2017 14:39:15 +0000 (16:39 +0200)]
MDL-58235 myoverview: Remove trailing whitespace