Commit graph

23340 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
91edf89d86 Merge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle 2017-05-03 18:44:38 +02:00
Dan Poltawski
2e04d92718 Merge branch 'MDL-58692-master-authcfgnames' of git://github.com/mudrd8mz/moodle 2017-05-03 11:17:45 +01:00
David Mudrák
31bd102316 MDL-58692 auth: Improve the migration of auth setting names
Some auth plugins used to have a mix of the legacy style of plugin names
in config_plugins table (such as 'auth/mnet') and the new correct
style (such as 'auth_mnet'). Attempting to rename the setting plugin via
low level SQL UPDATE could lead to duplicate key violation.

The patch introduces a new helper function to safely migrate the old
settings to the new ones, eventually informing the admin about the
values mismatch.
2017-05-03 12:02:43 +02:00
Dan Poltawski
b2a57a53f8 Merge branch 'wip-MDL-58661-master' of git://github.com/marinaglancy/moodle 2017-05-03 10:39:51 +01:00
Dan Poltawski
69cdead3d1 MDL-58788 docs: Note new behat compatibility page 2017-05-03 10:35:48 +01:00
Jun Pataleta
4d771e8099 Merge branch 'MDL-58535-master' of git://github.com/damyon/moodle 2017-05-03 16:41:38 +08:00
Jake Dallimore
d59415222d Merge branch 'MDL-58650_master' of git://github.com/markn86/moodle 2017-05-03 15:56:55 +08:00
Andrew Nicols
d98d245ba0 MDL-58746 core: Simplify environment check 2017-05-03 08:32:24 +08:00
Mark Nelson
685daf1aed MDL-58650 core_message: always use 'popup' processor for messages 2017-05-02 15:46:48 +08:00
Damyon Wiese
8eb128120a MDL-58535 oauth: Make the refreshtoken protected
It is set in subclasses so it should be protected (it was working regardless).
2017-05-02 12:21:36 +08:00
Andrew Nicols
4270ebea38 Merge branch 'MDL-57704-master' of https://github.com/xow/moodle 2017-05-02 10:35:46 +08:00
Damyon Wiese
3ba79ff19a MDL-58535 oauth2: Don't rely on the return scopes
MS makes a big mess of returning scopes from oauth requests. They only return the custom MS scopes like
User.Read and they never return non-MS scopes (like openid, profile, email).
2017-05-02 10:03:58 +08:00
John Okely
087662037b MDL-57704 ltiprovider: Don't force SSLv3 2017-05-02 09:33:18 +08:00
Dan Poltawski
f0572ad21f Merge branch 'MDL-58760-master-pixescape' of git://github.com/mudrd8mz/moodle 2017-05-01 11:25:39 +01:00
Damyon Wiese
8381b05d49 MDL-58535 repository_onedrive: Integration review fixes
Fixes for some missing imports and unused variables.
2017-05-01 16:15:36 +08:00
Andrew Nicols
9a2854cc65 MDL-58746 core: Add environment check for finfo 2017-05-01 09:01:21 +08:00
David Mudrák
74e238f4b7 MDL-58760 templates: Make {{#pix}} helper work with escaped icon key
There is a difference between how our PHP mustache engine and JS
mustache engine escaping works. If the icon key is not hard-coded in the
template but defined as a context variable, the JS mustache engine
escapes the forward slashes.
2017-04-28 23:04:04 +02:00
Dan Poltawski
712a9b6481 Merge branch 'MDL-58643-master' of git://github.com/snake/moodle 2017-04-28 09:44:35 +01:00
Jake Dallimore
7b86f2208f MDL-58643 behat: ensure results are in first page + multi suite fix. 2017-04-28 12:47:55 +08:00
Dan Poltawski
baf3d04954 Merge branch 'wip-MDL-58689-master' of git://github.com/marinaglancy/moodle 2017-04-27 18:35:28 +01:00
David Monllao
af282469b4 Merge branch 'MDL-58578-master' of git://github.com/cameron1729/moodle 2017-04-27 15:16:27 +08:00
Cameron Ball
a776415d55
MDL-58578 core_calendar: Properly respect priorities on overview
Prior to this patch, if a user was in two groups, and an override
existed for both groups in an assignment the override
visually lower on the override list would be displayed on the
overview, whereas the one visually higher would be displayed
in the assignment grading table.
2017-04-27 15:15:12 +08:00
Marina Glancy
8559427687 MDL-58661 filepicker: correct size for alias icons 2017-04-27 14:40:13 +08:00
Ankit Agarwal
9743b2d4a9 MDL-58701 phpunit: Add tests for external_settings 2017-04-27 09:37:53 +05:30
Ankit Agarwal
1d772481dd MDL-58701 libraries: Use pluginfile.php as rewrite url for web req. 2017-04-27 09:37:53 +05:30
David Monllao
8d12f5f2c0 Merge branch 'MDL-58698-master-strlang' of git://github.com/mudrd8mz/moodle 2017-04-27 11:34:47 +08:00
Andrew Nicols
14ed05c0dc Merge branch 'MDL-58691-master' of git://github.com/ankitagarwal/moodle 2017-04-27 11:25:35 +08:00
Marina Glancy
f2b5ed40f9 MDL-58689 dml: prevent logging during setup 2017-04-27 10:07:01 +08:00
David Mudrák
f387058839 MDL-58698 js: Fix the detection of the moodle language
This is the same problem that we had in MDL-52486. When the language
pack with multiple underscores (such as "en_us_k12") is selected, the
html root element's "lang" attribute is set to

    <html lang="en-us-12" ...>

which we then map back to the Moodle lang code using the JS function
replace().

What was missed in MDL-52486 was that when replacing a value (and not a
regular expression), only the first instance of the value is replaced.
So the value "en_us-k12" was sent as the lang parameter for the
core_string, which is invalid PARAM_LANG value and the exception was
thrown.

In case of the user_date.js, there was no actual problem experienced and
probably there is none as the language code is used as a cache key
rather than a PARAM_LANG parameter. But we are changing it too for
consistency.
2017-04-26 18:47:10 +02:00
Andrew Nicols
9020212522 MDL-58718 filestorage: Normalise file paths for Windows 2017-04-26 09:36:10 +08:00
Ankit Agarwal
34773ccf70 MDL-58691 exporter: Filters should always apply for web pages
The variables AJAX_SCIRPT, CLI_SCRIPT, WS_SERVER are always defined (and set to false)
when webpages are rendered, hence the check of 'defined' is invalid
2017-04-24 13:43:11 +05:30
Dan Poltawski
1d53b80c44 Merge branch 'MDL-58426-master-bigicons' of git://github.com/mudrd8mz/moodle 2017-04-20 10:33:53 +01:00
David Mudrák
750bbb68a8 MDL-58426 icons: Fix CSS for displaying big icons
The expected size of icons in the pix/b/ (big) folder was not respected
and they were displayed as 16x16 px.
2017-04-20 10:48:38 +02:00
Dan Poltawski
8afd1e2bd6 Merge branch 'MDL-58538-master' of git://github.com/junpataleta/moodle 2017-04-20 08:26:54 +01:00
Dan Poltawski
13e58982bb Merge branch 'MDL-58617-master' of git://github.com/lameze/moodle 2017-04-20 07:19:17 +01:00
Simey Lameze
f3dacc3860 MDL-58617 core_output: add mapping for dashboard on user menu 2017-04-20 13:56:13 +08:00
David Monllao
ce85011f5a Merge branch 'MDL-58280-master' of git://github.com/damyon/moodle 2017-04-20 12:05:42 +08:00
Damyon Wiese
0b1a14aef9 MDL-58280 fileconverter_googledrive: More helpful errors
Detect some config errors and give a better error message.
2017-04-20 11:28:06 +08:00
Damyon Wiese
32f01c546c MDL-58280 fileconverter_googledrive: Fix cibot complaints 2017-04-20 10:49:17 +08:00
Damyon Wiese
9fe3363301 MDL-58280 fileconverter_googledrive: Is born. 2017-04-20 10:49:17 +08:00
Jake Dallimore
fedb00d4bb Merge branch 'MDL-58520-master' of git://github.com/ryanwyllie/moodle 2017-04-19 15:50:48 +08:00
Ryan Wyllie
4671ae6374 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.
2017-04-19 05:47:40 +00:00
Jun Pataleta
088598ba28 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().
2017-04-19 12:29:19 +08:00
Andrew Nicols
442908a100 Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle 2017-04-19 11:53:40 +08:00
Jake Dallimore
273d310601 MDL-58138 completion: Fixes for a number of small issues. 2017-04-19 11:41:57 +08:00
David Monllao
ac0553aa64 Merge branch 'MDL-54901' of git://github.com/stronk7/moodle 2017-04-19 11:30:03 +08:00
Jake Dallimore
b17ee68202 MDL-58138 completion: Assorted linting fixes.
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Marina Glancy
a64a9f9ce4 MDL-58267 completion: style and capabilities cleanup
Part of MDL-58138 epic
2017-04-19 08:54:35 +08:00
Marina Glancy
7f53e8aa22 MDL-58267 completion: allow to set default activity completion
Part of MDL-58138 epic
2017-04-19 08:54:35 +08:00
Marina Glancy
06cdda468a MDL-58139 completion: bulk update completion
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00