Commit graph

83941 commits

Author SHA1 Message Date
AMOS bot
a7e60c1291 Automatically generated installer lang files 2017-04-13 00:03:51 +08:00
David Monllao
0714bcb2a2 on-demand release 3.3dev+ 2017-04-12 09:33:40 +02:00
David Monllao
a701701869 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-04-12 09:33:39 +02:00
Andrew Nicols
30829b5dc3 MDL-58311 cachestore_redis: Set password correctly 2017-04-12 14:41:54 +08:00
Jun Pataleta
8168bfd3e4 Merge branch 'MDL-58576-master' of git://github.com/andrewnicols/moodle 2017-04-12 10:06:13 +08:00
Andrew Nicols
0c0f3fdc1e MDL-58576 mod_forum: Fix behat failures after string change 2017-04-12 09:32:05 +08:00
Eloy Lafuente (stronk7)
ad02561c15 Merge branch 'MDL-58453-master' of git://github.com/jleyva/moodle 2017-04-11 16:47:29 +02:00
Juan Leyva
7f700290b2 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)
2017-04-11 09:42:27 +01:00
Jake Dallimore
c89eba308a Merge branch 'MDL-58563-master' of git://github.com/junpataleta/moodle 2017-04-11 15:09:27 +08:00
Jun Pataleta
d3679c37af MDL-58563 group: Specify table alias in sort parameter for group test 2017-04-11 12:40:41 +08:00
Andrew Nicols
1ad2ff0404 Merge branch 'wip-MDL-57616-master' of git://github.com/marinaglancy/moodle 2017-04-11 11:51:59 +08:00
Andrew Nicols
9b18c0e075 Merge branch 'MDL-58461-master' of git://github.com/damyon/moodle 2017-04-11 11:15:32 +08:00
Jake Dallimore
84fb93a77e Merge branch 'MDL-58297-master' of git://github.com/andrewnicols/moodle 2017-04-11 10:49:07 +08:00
Andrew Nicols
f669ad5ca7 Merge branch 'MDL-58552-master' of git://github.com/damyon/moodle 2017-04-11 09:46:04 +08:00
Damyon Wiese
21b4989ac4 MDL-58461 filter_mathjaxloader: Update defaults
Also included a version bump for Moodle in order to trigger a filter upgrade.
2017-04-11 09:19:02 +08:00
Damyon Wiese
3db9004f7d MDL-58461 mathjax: Ship accessibility extensions
There are not mirrored on the new CDN so we need to ship them with moodle.
2017-04-11 09:18:23 +08:00
Damyon Wiese
7a0f141dfe MDL-58461 filter_mathjaxloader: Change CDN url
The MathJax CDN url is going away - we need to switch to another mirror.
2017-04-11 09:18:23 +08:00
Jun Pataleta
f59c43a0fa Merge branch 'MDL-58400-master' of git://github.com/junpataleta/moodle 2017-04-11 09:14:12 +08:00
Andrew Nicols
23605e9fbc Merge branch 'MDL-58504_master' of git://github.com/markn86/moodle 2017-04-11 08:57:30 +08:00
Andrew Nicols
18baa6c956 Merge branch 'MDL-57290_master' of https://github.com/nadavkav/moodle 2017-04-11 08:43:36 +08:00
AMOS bot
867c560f43 Automatically generated installer lang files 2017-04-11 00:04:27 +08:00
David Monllao
eda9dbcfe0 Merge branch 'patch-24' of https://github.com/sk-unikent/moodle 2017-04-10 16:59:13 +02:00
David Monllao
696bfb490b Merge branch 'mdl-58489' of https://github.com/Dagefoerde/moodle 2017-04-10 16:55:46 +02:00
David Monllao
9f22961d93 Merge branch 'mdl-58485' of https://github.com/Dagefoerde/moodle 2017-04-10 16:31:58 +02:00
David Monllao
fff1b3c464 Merge branch 'wip-MDL-55950-master' of git://github.com/marinaglancy/moodle 2017-04-10 16:05:07 +02:00
David Monllao
ad6478225b Merge branch 'MDL-57858-master' of git://github.com/pavelsokolov/moodle 2017-04-10 14:14:59 +02:00
David Monllao
d096ebe0e4 MDL-56370 mod_feedback: Note about undeprecation 2017-04-10 13:15:15 +02:00
David Monllao
af938cf46e Merge branch 'wip-MDL-56370-master' of git://github.com/marinaglancy/moodle 2017-04-10 13:13:20 +02:00
David Monllao
3c8b8b8262 Merge branch 'wip-MDL-55939-master' of git://github.com/marinaglancy/moodle 2017-04-10 12:57:34 +02:00
David Monllao
f0ad40d13c Merge branch 'MDL-57553-master' of git://github.com/andrewnicols/moodle 2017-04-10 11:44:14 +02:00
David Monllao
538dbf37e1 Merge branch 'MDL-58492-master-famarkers' of git://github.com/mudrd8mz/moodle 2017-04-10 11:10:04 +02:00
Jun Pataleta
60b6e1bf0b Merge branch 'MDL-58295-master' of git://github.com/andrewnicols/moodle 2017-04-10 16:51:06 +08:00
David Monllao
7841e9f337 Merge branch 'MDL-58104-m' of git://github.com/pavelsokolov/moodle 2017-04-10 09:51:32 +02:00
Nadav Kavalerchik
85b0d4a9cb MDL-57290 Theme: Narrow admin page "menu" columns, in Boost & Clean 2017-04-10 10:09:03 +03:00
Damyon Wiese
f3432e038e 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).
2017-04-10 13:51:02 +08:00
Andrew Nicols
137ea0572d Merge branch 'wip-MDL-58180-master' of git://github.com/marinaglancy/moodle 2017-04-10 13:37:06 +08:00
Andrew Nicols
17cc2842a7 Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle 2017-04-10 13:35:36 +08:00
Jun Pataleta
9be24e45b7 Merge branch 'MDL-58357-master' of git://github.com/damyon/moodle 2017-04-10 13:26:21 +08:00
Andrew Nicols
3afd529013 Merge branch 'MDL-57393-master' of git://github.com/jleyva/moodle 2017-04-10 13:20:13 +08:00
Andrew Nicols
04e45e8e25 Merge branch 'master' of https://github.com/tniessen/moodle 2017-04-10 13:16:29 +08:00
Jake Dallimore
cea0492924 Merge branch 'MDL-58543' of git://github.com/stronk7/moodle 2017-04-10 12:36:56 +08:00
Andrew Nicols
3de074e4bf Merge branch 'MDL-58311_master' of https://github.com/sk-unikent/moodle 2017-04-10 12:00:59 +08:00
Andrew Nicols
1adae85448 Merge branch 'wip-mdl-58068' of https://github.com/rajeshtaneja/moodle 2017-04-10 11:54:09 +08:00
Damyon Wiese
d84b7f7f5c MDL-58359 icons: Revert the icons for completion
We are missing one for "auto-completion not yet completed" etc.
2017-04-10 11:47:08 +08:00
Andrew Nicols
b140b13c25 Merge branch 'MDL-58453-master' of git://github.com/jleyva/moodle 2017-04-10 11:23:37 +08:00
Juan Leyva
e352f30699 MDL-58400 tool_mobile: Support direct launch of OAuth SSO process 2017-04-10 11:12:29 +08:00
Juan Leyva
a67e3bda2e MDL-58400 tool_mobile: Return enabled identity providers
Via this public Ajax Web Service we return the list of identity
providers in a site.
2017-04-10 11:12:28 +08:00
Jun Pataleta
627ea5b10e 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
2017-04-10 11:12:03 +08:00
Jake Dallimore
94a26699b1 Merge branch 'MDL-57813-master' of git://github.com/jleyva/moodle 2017-04-10 10:25:23 +08:00
Eloy Lafuente (stronk7)
2f090f4619 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).
2017-04-09 14:11:20 +02:00