David Monllao [Thu, 20 Apr 2017 08:08:52 +0000 (16:08 +0800)]
Merge branch 'MDL-58623_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 20 Apr 2017 07:26:54 +0000 (08:26 +0100)]
Merge branch 'MDL-58538-master' of git://github.com/junpataleta/moodle
Mark Nelson [Thu, 20 Apr 2017 07:16:56 +0000 (15:16 +0800)]
MDL-58623 course: allow course summaries to be null in exporter
Andrew Nicols [Thu, 20 Apr 2017 07:23:50 +0000 (15:23 +0800)]
Merge branch 'MDL-58494-master' of git://github.com/ryanwyllie/moodle
David Monllao [Thu, 20 Apr 2017 07:17:59 +0000 (15:17 +0800)]
Merge branch 'MDL-58349-master' of git://github.com/damyon/moodle
Jake Dallimore [Thu, 20 Apr 2017 07:10:21 +0000 (15:10 +0800)]
Merge branch 'wip-MDL-58452-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 20 Apr 2017 06:44:56 +0000 (07:44 +0100)]
Merge branch 'MDL-58498-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Thu, 20 Apr 2017 06:27:56 +0000 (07:27 +0100)]
Merge branch 'MDL-58637_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 20 Apr 2017 06:19:17 +0000 (07:19 +0100)]
Merge branch 'MDL-58617-master' of git://github.com/lameze/moodle
David Monllao [Thu, 20 Apr 2017 06:05:39 +0000 (14:05 +0800)]
Merge branch 'MDL-58278-master' of git://github.com/damyon/moodle
Simey Lameze [Thu, 20 Apr 2017 01:11:25 +0000 (09:11 +0800)]
MDL-58617 core_output: add mapping for dashboard on user menu
Andrew Nicols [Thu, 20 Apr 2017 05:54:43 +0000 (13:54 +0800)]
Merge branch 'wip-MDL-58138-fix' of https://github.com/marinaglancy/moodle
Mark Nelson [Thu, 20 Apr 2017 05:53:42 +0000 (13:53 +0800)]
MDL-58637 format_*: fixed incorrect CSS selector
Ryan Wyllie [Mon, 10 Apr 2017 04:35:21 +0000 (04:35 +0000)]
MDL-58494 mod_feedback: no action after feedback submitted
Don't provide an action in the action event callback if the user has
already submitted their feedback or if they don't have permission to
submit.
Marina Glancy [Thu, 20 Apr 2017 05:42:07 +0000 (13:42 +0800)]
MDL-58138 completion: mform wants 0-based indexes for arrays
Andrew Nicols [Thu, 20 Apr 2017 05:47:21 +0000 (13:47 +0800)]
MDL-58515
Andrew Nicols [Thu, 20 Apr 2017 05:03:34 +0000 (13:03 +0800)]
Merge branch 'MDL-58515-master' of https://github.com/lucisgit/moodle
Andrew Nicols [Thu, 20 Apr 2017 04:58:48 +0000 (12:58 +0800)]
Merge branch 'MDL-58370-master' of git://github.com/damyon/moodle
Andrew Nicols [Thu, 20 Apr 2017 04:38:05 +0000 (12:38 +0800)]
Merge branch 'MDL-57456_master-fix' of git://github.com/dmonllao/moodle
David Monllao [Thu, 20 Apr 2017 04:32:05 +0000 (12:32 +0800)]
MDL-57456 mod_glossary: Proper course access in behat test
David Monllao [Thu, 20 Apr 2017 04:05:42 +0000 (12:05 +0800)]
Merge branch 'MDL-58280-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 16 Mar 2017 12:28:50 +0000 (20:28 +0800)]
MDL-58278 mod_assign: Ignore send notify with mw
When marking workflow is on and the grade is not released we never send notifications anyway.
Instead of preventing the grading form from submitting (validation error) we silently ignore it.
Damyon Wiese [Thu, 20 Apr 2017 03:27:25 +0000 (11:27 +0800)]
MDL-58280 fileconverter_googledrive: More helpful errors
Detect some config errors and give a better error message.
Damyon Wiese [Fri, 24 Mar 2017 07:37:45 +0000 (15:37 +0800)]
MDL-58280 fileconverter_googledrive: Fix cibot complaints
Damyon Wiese [Thu, 16 Mar 2017 07:45:22 +0000 (15:45 +0800)]
MDL-58280 fileconverter_googledrive: Is born.
Damyon Wiese [Mon, 10 Apr 2017 06:17:38 +0000 (14:17 +0800)]
MDL-58370 theme: Tiny alignment fixes for icons
The group / completion icons on the course page do not quite line up perfectly in boost or clean.
This tweaks them.
Jake Dallimore [Thu, 20 Apr 2017 01:56:10 +0000 (09:56 +0800)]
Merge branch 'MDL-58412-master' of git://github.com/jleyva/moodle
Juan Leyva [Wed, 19 Apr 2017 09:37:15 +0000 (11:37 +0200)]
MDL-58412 mod_feedback: Use constant for anonymous feedback
We were using hardcoded values instead the correct constant
FEEDBACK_ANONYMOUS_NO
Jun Pataleta [Wed, 19 Apr 2017 08:55:14 +0000 (16:55 +0800)]
Merge branch 'wip-MDL-58530-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Wed, 19 Apr 2017 08:20:21 +0000 (16:20 +0800)]
Merge branch 'MDL-58642-master' of git://github.com/lameze/moodle
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
Simey Lameze [Wed, 19 Apr 2017 06:32:08 +0000 (14:32 +0800)]
MDL-58642 mod_glossary: add mapping for minus icon
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.
Jun Pataleta [Fri, 7 Apr 2017 09:25:44 +0000 (17:25 +0800)]
MDL-58538 repository_onedrive: Use image_url() instead of pix_url()
Jun Pataleta [Fri, 7 Apr 2017 09:22:06 +0000 (17:22 +0800)]
MDL-58538 core: Set proper PHP Documentation for pix_url()
Add @deprecated tag for theme_config::pix_url(). Add PHPDoc block for
renderer_base::pix_url().
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