David Monllao [Wed, 12 Apr 2017 14:18:53 +0000 (16:18 +0200)]
Merge branch 'MDL57475-master' of https://github.com/mmafrar/moodle
David Monllao [Wed, 12 Apr 2017 13:46:01 +0000 (15:46 +0200)]
Merge branch 'MDL-58235-master-3' of git://github.com/ryanwyllie/moodle
David Monllao [Wed, 12 Apr 2017 12:08:27 +0000 (14:08 +0200)]
Merge branch 'MDL-58555' of https://github.com/timhunt/moodle
Ankit Agarwal [Mon, 10 Apr 2017 05:02:50 +0000 (10:32 +0530)]
MDL-57573 phpmailer: Update to version 5.2.23
David Monllao [Wed, 12 Apr 2017 07:33:40 +0000 (09:33 +0200)]
on-demand release 3.3dev+
David Monllao [Wed, 12 Apr 2017 07:33:39 +0000 (09:33 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Wed, 12 Apr 2017 06:31:46 +0000 (14:31 +0800)]
MDL-58311 cachestore_redis: Set password correctly
Jun Pataleta [Wed, 12 Apr 2017 02:06:13 +0000 (10:06 +0800)]
Merge branch 'MDL-58576-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 12 Apr 2017 01:32:05 +0000 (09:32 +0800)]
MDL-58576 mod_forum: Fix behat failures after string change
Eloy Lafuente (stronk7) [Tue, 11 Apr 2017 14:47:29 +0000 (16:47 +0200)]
Merge branch 'MDL-58453-master' of git://github.com/jleyva/moodle
Juan Leyva [Tue, 11 Apr 2017 08:42:27 +0000 (09:42 +0100)]
MDL-58453 mod_feedback: Add missing security checks
Some checks done in mod/feedback/show_nonrespondents.php were missing.
- Check for anonymous feedback
- Check for real courses (not site home)
Jake Dallimore [Tue, 11 Apr 2017 07:09:27 +0000 (15:09 +0800)]
Merge branch 'MDL-58563-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Tue, 11 Apr 2017 04:40:41 +0000 (12:40 +0800)]
MDL-58563 group: Specify table alias in sort parameter for group test
Andrew Nicols [Tue, 11 Apr 2017 03:51:59 +0000 (11:51 +0800)]
Merge branch 'wip-MDL-57616-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 11 Apr 2017 03:15:32 +0000 (11:15 +0800)]
Merge branch 'MDL-58461-master' of git://github.com/damyon/moodle
Jake Dallimore [Tue, 11 Apr 2017 02:49:07 +0000 (10:49 +0800)]
Merge branch 'MDL-58297-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Tue, 11 Apr 2017 01:46:04 +0000 (09:46 +0800)]
Merge branch 'MDL-58552-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 3 Apr 2017 04:36:45 +0000 (12:36 +0800)]
MDL-58461 filter_mathjaxloader: Update defaults
Also included a version bump for Moodle in order to trigger a filter upgrade.
Damyon Wiese [Mon, 3 Apr 2017 04:14:04 +0000 (12:14 +0800)]
MDL-58461 mathjax: Ship accessibility extensions
There are not mirrored on the new CDN so we need to ship them with moodle.
Damyon Wiese [Mon, 3 Apr 2017 02:32:31 +0000 (10:32 +0800)]
MDL-58461 filter_mathjaxloader: Change CDN url
The MathJax CDN url is going away - we need to switch to another mirror.
Jun Pataleta [Tue, 11 Apr 2017 01:14:12 +0000 (09:14 +0800)]
Merge branch 'MDL-58400-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 11 Apr 2017 00:57:30 +0000 (08:57 +0800)]
Merge branch 'MDL-58504_master' of git://github.com/markn86/moodle
Andrew Nicols [Tue, 11 Apr 2017 00:43:36 +0000 (08:43 +0800)]
Merge branch 'MDL-57290_master' of https://github.com/nadavkav/moodle
Ryan Wyllie [Tue, 11 Apr 2017 00:20:29 +0000 (00:20 +0000)]
MDL-58235 block_myoverview: fix buttons on courses view
AMOS bot [Mon, 10 Apr 2017 16:04:27 +0000 (00:04 +0800)]
Automatically generated installer lang files
Tim Hunt [Mon, 10 Apr 2017 15:29:16 +0000 (16:29 +0100)]
MDL-58555 ajax: make ajax web service log entries more useful
It is not used for anything, but we put the method name(s) being called in the URL.
David Monllao [Mon, 10 Apr 2017 14:59:13 +0000 (16:59 +0200)]
Merge branch 'patch-24' of https://github.com/sk-unikent/moodle
David Monllao [Mon, 10 Apr 2017 14:55:46 +0000 (16:55 +0200)]
Merge branch 'mdl-58489' of https://github.com/Dagefoerde/moodle
David Monllao [Mon, 10 Apr 2017 14:31:58 +0000 (16:31 +0200)]
Merge branch 'mdl-58485' of https://github.com/Dagefoerde/moodle
David Monllao [Mon, 10 Apr 2017 14:05:07 +0000 (16:05 +0200)]
Merge branch 'wip-MDL-55950-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 10 Apr 2017 12:14:59 +0000 (14:14 +0200)]
Merge branch 'MDL-57858-master' of git://github.com/pavelsokolov/moodle
David Monllao [Mon, 10 Apr 2017 11:15:15 +0000 (13:15 +0200)]
MDL-56370 mod_feedback: Note about undeprecation
David Monllao [Mon, 10 Apr 2017 11:13:20 +0000 (13:13 +0200)]
Merge branch 'wip-MDL-56370-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 10 Apr 2017 10:57:34 +0000 (12:57 +0200)]
Merge branch 'wip-MDL-55939-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 10 Apr 2017 09:44:14 +0000 (11:44 +0200)]
Merge branch 'MDL-57553-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 10 Apr 2017 09:10:04 +0000 (11:10 +0200)]
Merge branch 'MDL-58492-master-famarkers' of git://github.com/mudrd8mz/moodle
Jun Pataleta [Mon, 10 Apr 2017 08:51:06 +0000 (16:51 +0800)]
Merge branch 'MDL-58295-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 10 Apr 2017 07:51:32 +0000 (09:51 +0200)]
Merge branch 'MDL-58104-m' of git://github.com/pavelsokolov/moodle
Nadav Kavalerchik [Mon, 10 Apr 2017 07:09:03 +0000 (10:09 +0300)]
MDL-57290 Theme: Narrow admin page "menu" columns, in Boost & Clean
Barbara Ramiro [Fri, 24 Mar 2017 07:38:07 +0000 (07:38 +0000)]
MDL-58235 block_myoverview: clean theme style for block_myoverview
This is for the 'Timeline' view in Clean theme
Part of MDL-55611
Ryan Wyllie [Tue, 21 Mar 2017 06:03:47 +0000 (06:03 +0000)]
MDL-58235 block_myoverview: add styling for clean theme
Part of MDL-55611
Damyon Wiese [Mon, 10 Apr 2017 05:51:02 +0000 (13:51 +0800)]
MDL-58552 quiz: keep quiz css in quiz
The selectors introduced by MDL-48771 need to be qualified to prevent them
breaking random pages (like the course page).
Andrew Nicols [Mon, 10 Apr 2017 05:37:06 +0000 (13:37 +0800)]
Merge branch 'wip-MDL-58180-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 10 Apr 2017 05:35:36 +0000 (13:35 +0800)]
Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle
Jun Pataleta [Mon, 10 Apr 2017 05:26:21 +0000 (13:26 +0800)]
Merge branch 'MDL-58357-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 10 Apr 2017 05:20:13 +0000 (13:20 +0800)]
Merge branch 'MDL-57393-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 10 Apr 2017 05:16:29 +0000 (13:16 +0800)]
Merge branch 'master' of https://github.com/tniessen/moodle
Jake Dallimore [Mon, 10 Apr 2017 04:36:56 +0000 (12:36 +0800)]
Merge branch 'MDL-58543' of git://github.com/stronk7/moodle
Andrew Nicols [Mon, 10 Apr 2017 04:00:59 +0000 (12:00 +0800)]
Merge branch 'MDL-58311_master' of https://github.com/sk-unikent/moodle
Andrew Nicols [Mon, 10 Apr 2017 03:54:09 +0000 (11:54 +0800)]
Merge branch 'wip-mdl-58068' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Mon, 27 Mar 2017 08:12:20 +0000 (16:12 +0800)]
MDL-58359 icons: Revert the icons for completion
We are missing one for "auto-completion not yet completed" etc.
Andrew Nicols [Mon, 10 Apr 2017 03:23:37 +0000 (11:23 +0800)]
Merge branch 'MDL-58453-master' of git://github.com/jleyva/moodle
Juan Leyva [Mon, 27 Mar 2017 16:13:49 +0000 (18:13 +0200)]
MDL-58400 tool_mobile: Support direct launch of OAuth SSO process
Juan Leyva [Mon, 27 Mar 2017 16:09:21 +0000 (18:09 +0200)]
MDL-58400 tool_mobile: Return enabled identity providers
Via this public Ajax Web Service we return the list of identity
providers in a site.
Jun Pataleta [Wed, 5 Apr 2017 07:20:30 +0000 (15:20 +0800)]
MDL-58400 auth: New helper methods for identity providers
* get_identity_providers(): Retrieves available auth identity providers
* prepare_identity_providers_for_output(): Prepares auth identity
provider data for output (e.g. to templates, WS, etc)
* Use these helpers for the login renderer
Jake Dallimore [Mon, 10 Apr 2017 02:25:23 +0000 (10:25 +0800)]
Merge branch 'MDL-57813-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Sun, 9 Apr 2017 12:11:20 +0000 (14:11 +0200)]
MDL-58543 upgrade: Replay 4 steps missed for some combinations
Moved 4 steps (
2017033100.01-04) that were introduced after master
version was
2017040300 and were not executed always.
They have been moved to
2017040700.01-04, just on top of current
weekly (
2017040700.00), so they will be executed by everybody.
As far as the 4 fields are XMLDB ones they are executed conditionally
so it's safe to replay them (for people that already had them run).
AMOS bot [Fri, 7 Apr 2017 16:05:03 +0000 (00:05 +0800)]
Automatically generated installer lang files
David Mudrák [Fri, 7 Apr 2017 12:35:16 +0000 (14:35 +0200)]
MDL-58492 icons: Fix fontawesome for i/marker and i/marked icons
These combo icons are used to mark something the current element. They
are supposed to be used in places like the course outline to
mark/highlight a section as the current one. Also workshop uses them to
switch to a phase (mark it as the current one).
Jan Dageförde [Tue, 4 Apr 2017 13:44:46 +0000 (15:44 +0200)]
MDL-58485 admin: Show all SVG plugin icons
Luca Bösch [Tue, 7 Mar 2017 23:57:46 +0000 (00:57 +0100)]
MDL-58180 lib: Role name pass format_text.
In function stats_get_report_options, the role names are returned after
having been processed through format_text which lets the filters work on them.
Signed-off-by: Luca Bösch <luca.boesch@bfh.ch>
Marina Glancy [Tue, 4 Apr 2017 04:30:18 +0000 (12:30 +0800)]
MDL-57616 media_videojs: set min height for videos
This partially reverts changes from MDL-57187 that added the limit for all videos and not just videojs.
Videojs displays a big play button that overlaps contents below during video loading.
Marina Glancy [Wed, 5 Apr 2017 06:59:38 +0000 (14:59 +0800)]
MDL-55939 course: no permission is needed to view frontpage
Marina Glancy [Wed, 5 Apr 2017 08:07:41 +0000 (16:07 +0800)]
MDL-56370 mod_feedback: behat for repeat completion
Marina Glancy [Wed, 5 Apr 2017 07:44:38 +0000 (15:44 +0800)]
MDL-56370 mod_feedback: allow to restore values from last attempt
Marina Glancy [Thu, 6 Apr 2017 07:27:25 +0000 (15:27 +0800)]
MDL-55950 mod_feedback: correct link to response in the email
Jan Dageförde [Tue, 4 Apr 2017 19:02:51 +0000 (21:02 +0200)]
MDL-58489 core: Fix unreachable HTTP error handling
Jun Pataleta [Fri, 7 Apr 2017 04:45:45 +0000 (12:45 +0800)]
weekly release 3.3dev
Jun Pataleta [Fri, 7 Apr 2017 04:45:45 +0000 (12:45 +0800)]
NOBUG: Fixed file access permissions
Jun Pataleta [Fri, 7 Apr 2017 04:45:44 +0000 (12:45 +0800)]
NOBUG: Fixed SVG browser compatibility
Jun Pataleta [Fri, 7 Apr 2017 04:45:44 +0000 (12:45 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Fri, 17 Mar 2017 07:21:59 +0000 (15:21 +0800)]
MDL-58297 core: Update to use new hashing functions
Andrew Nicols [Fri, 17 Mar 2017 07:19:10 +0000 (15:19 +0800)]
MDL-58297 filestorage: New functions for hash calculation
David Monllao [Thu, 6 Apr 2017 16:59:12 +0000 (18:59 +0200)]
MDL-55611 mod_quiz: Adapt behat test to myoverview
AMOS bot [Thu, 6 Apr 2017 16:04:33 +0000 (00:04 +0800)]
Automatically generated installer lang files
David Monllao [Thu, 6 Apr 2017 13:50:06 +0000 (15:50 +0200)]
MDL-12689 auth_shibboleth: No remote updates
Dan Poltawski [Thu, 6 Apr 2017 09:52:24 +0000 (10:52 +0100)]
MDL-12689 version: bump after behat fix
Dan Poltawski [Thu, 6 Apr 2017 09:51:37 +0000 (10:51 +0100)]
Merge branch 'MDL-12689_master-fix' of git://github.com/dmonllao/moodle
David Monllao [Thu, 6 Apr 2017 09:20:22 +0000 (11:20 +0200)]
MDL-12689 auth_cas: Default to English
Jake Dallimore [Thu, 6 Apr 2017 08:29:13 +0000 (16:29 +0800)]
Merge branch 'MDL-58220-master-fix5' of github.com/damyon/moodle
David Monllao [Thu, 6 Apr 2017 08:22:59 +0000 (10:22 +0200)]
MDL-23919 mod_data: Required entries not available by default anymore
Updating test accordingly, but still setting and checking a
field that is not part of the fieldsets opened by default.
Damyon Wiese [Thu, 6 Apr 2017 08:06:12 +0000 (16:06 +0800)]
MDL-58220 auth_oauth2: Linked logins only 4U
You can only manage your own linked logins - never anyone elses.
Dan Poltawski [Thu, 6 Apr 2017 07:56:51 +0000 (08:56 +0100)]
Merge branch 'MDL-55611-master-behat-fix' of git://github.com/lameze/moodle
Juan Leyva [Fri, 17 Mar 2017 11:04:56 +0000 (12:04 +0100)]
MDL-57813 mod_feedback: New WS mod_feedback_get_last_completed
David Monllao [Thu, 6 Apr 2017 07:30:45 +0000 (09:30 +0200)]
Merge branch 'wip-MDL-58364-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Thu, 6 Apr 2017 07:21:57 +0000 (15:21 +0800)]
MDL-55611 course: Fix incorrect merge conflict
Simey Lameze [Thu, 6 Apr 2017 07:22:15 +0000 (15:22 +0800)]
MDL-55611 core_tests: replace remaining I follow coursename steps
Mark Nelson [Wed, 5 Apr 2017 07:15:09 +0000 (15:15 +0800)]
MDL-58504 mod_*: fixed PHPDoc return type for *_provide_event_action
David Monllao [Thu, 6 Apr 2017 06:59:21 +0000 (08:59 +0200)]
Merge branch 'MDL-58369-master' of git://github.com/damyon/moodle
David Monllao [Thu, 6 Apr 2017 06:38:52 +0000 (08:38 +0200)]
Merge branch 'MDL-58398-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Thu, 6 Apr 2017 05:24:05 +0000 (13:24 +0800)]
Merge branch 'MDL-55611_master' of git://github.com/markn86/moodle
Mark Nelson [Thu, 6 Apr 2017 04:45:16 +0000 (12:45 +0800)]
MDL-55611 core_calendar: Fixed query for Oracle
Also fixed unit test filter.
Andrew Nicols [Thu, 6 Apr 2017 03:54:58 +0000 (11:54 +0800)]
Merge branch 'MDL-58220-master-fix4' of github.com/damyon/moodle
Damyon Wiese [Thu, 6 Apr 2017 03:18:47 +0000 (11:18 +0800)]
MDL-58220 auth_oauth2: Fix login domains
The login domains were checking the email of the moodle account, not the returned
email from oauth. Also after a failure, it was not killing the oauth session, which
prevents you trying again with a different account.
Damyon Wiese [Thu, 6 Apr 2017 02:41:46 +0000 (10:41 +0800)]
MDL-58220 oauth2: Fix account linking
The username passed to the confirm account link request is the oauth username,
which may be different to the moodle username so can't be used to look up the user record.
Jake Dallimore [Thu, 6 Apr 2017 01:41:37 +0000 (09:41 +0800)]
Merge branch 'MDL-58443-master' of git://github.com/jleyva/moodle
Jake Dallimore [Thu, 6 Apr 2017 01:23:29 +0000 (09:23 +0800)]
Merge branch 'MDL-55611-master-fix' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 6 Apr 2017 01:02:36 +0000 (09:02 +0800)]
Merge branch 'wip-MDL-23919-master' of https://github.com/marinaglancy/moodle
Marina Glancy [Thu, 6 Apr 2017 00:54:00 +0000 (08:54 +0800)]
MDL-23919 mod_data: fix bug when completion is reset
Andrew Nicols [Thu, 6 Apr 2017 00:50:11 +0000 (08:50 +0800)]
MDL-55611 calendar: Fix unit test filter
The event test factory uses a closure to return only every other record.
This was previously working based on ID but MSSQL starts from an even
number rather than an odd number.
This change changes that to use a static variable which keeps a count of
the records instead and only returns every other record in this fashion,
removing the dependance upon ID.
