Commit Graph

24767 Commits

Author SHA1 Message Date
Andrew Nicols 1d52a56e48 Merge branch 'MDL-58756-statslib-roles-multilang' of https://github.com/lucaboesch/moodle 2017-05-16 13:52:05 +08:00
Luca Bösch 4bd112e4de MDL-58756 stats: Use multilang with role. 2017-05-16 07:29:09 +02:00
Mark Nelson 004dcb4f58 MDL-58936 core: ensure 'page->context' is not null
When using $page->context it calls magic_get_context() in lib/pagelib.php.
This method sets the context to context_system::instance() if it is currently
null and returns that as the context. However, when installing a new site
context_system::instance() also returns null.
2017-05-15 12:29:15 +08:00
Dan Poltawski bcf69a655a MDL-58837 js: fix jsdoc error 2017-05-11 14:29:11 +01:00
Dan Poltawski a1c6871bb3 Merge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle 2017-05-11 14:26:33 +01:00
Marina Glancy f24e17c93e MDL-58837 course: allow to add multiple sections 2017-05-11 18:48:04 +08:00
Jake Dallimore e84fefdb09 Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle 2017-05-11 11:41:48 +08:00
Eloy Lafuente (stronk7) 3a7afbe9cb Merge branch 'MDL-58874-master' of https://github.com/xow/moodle 2017-05-10 13:31:24 +02:00
John Okely 0ac1dcd8d1 MDL-58874 icons: Change the icon for grade in course completion report 2017-05-10 15:38:40 +08:00
John Okely cf7ac86858 MDL-58874 icons: use table for grades icon in grader report 2017-05-10 15:34:45 +08:00
Cameron Ball 79b80ee540 MDL-58777 core: Remove redundant refresh events tasks
There were 4 instances of the calendar refresh events task being
queued, which is redundant as we now have the "one true task" to
fix the events table, and it needs to be run for everybody.
2017-05-10 14:16:13 +08:00
David Monllao 265a1eafc5 Merge branch 'MDL-58857-master' of git://github.com/andrewnicols/moodle 2017-05-10 13:50:10 +08:00
Cameron Ball 9c98546da6 MDL-58777 core: Use component_callback in refresh events task
Previously we did not require the lib.php files for each module
in this ad-hoc task, which meant that the *_refresh_events functions
would only be called if some lucky sequence of events led to the
lib.php file for the module being required.

Instead we should use the component_callback function which can handle
that stuff automagically.
2017-05-10 13:41:18 +08:00
Eloy Lafuente (stronk7) 675ffb4d05 Merge branch 'wip-MDL-58854-master' of git://github.com/marinaglancy/moodle 2017-05-10 02:09:02 +02:00
Andrew Nicols a011effb49 MDL-58857 admin: Terminate the session if a major upgrade is required 2017-05-09 15:00:00 +08:00
Marina Glancy 947f5c3448 MDL-58854 theme_boost: override templates for columns 2017-05-09 10:36:16 +08:00
Eloy Lafuente (stronk7) d989ee1e03 MDL-58853 versions: bump all versions and requires near release
version = 2017051500 release version
requires= 2017050500 current rc1 version
2017-05-09 02:58:28 +02:00
Dan Poltawski 1595500ffe Merge branch 'MDL-58793-master-authcfgskip' of git://github.com/mudrd8mz/moodle 2017-05-08 14:46:26 +01:00
David Mudrák 2b948c204a MDL-58793 auth: Do not report migrated settings as new ones on upgrade
As a result of fixing the auth plugins config storage in MDL-12689, many
settings would be falsely reported as new ones by
admin/upgradesettings.php. We do not want to confuse admins so we try to
reduce the bewilderment by pre-populating the config_plugins table with
default values. This should be done only for disabled auth methods. The
enabled methods have their settings already stored, so reporting actual
new settings for them is valid.
2017-05-08 11:51:55 +02:00
Jun Pataleta 9a10704e7d Merge branch 'MDL-58771-master' of git://github.com/damyon/moodle 2017-05-08 16:58:20 +08:00
Damyon Wiese ae53889d14 MDL-58771 tinymce: emoticon bug
Um - this code is regexing for exact strings generated from the rendering of icons. I'm not going to rewrite anything
to do with tinymce - for now we just make the regexes far less specific.
2017-05-08 12:32:26 +08:00
Jake Dallimore 021a143914 MDL-58684 upgrade: re-run deletion of portfolio_tempdata upgrade step 2017-05-08 12:26:16 +08:00
Jake Dallimore e927581a50 MDL-58684 files: Ensure stored_file never serializes the file_storage
Magic methods __sleep and __wakeup used to properly store only the
file_record property and to reinit using get_file_storage().
2017-05-08 11:12:39 +08:00
Jun Pataleta c3b1178d58 MDL-58810 calendar: Fix rrule_manager issues
* Set the correct repeat ID for the recurring event
* Unset UUID for 'child' events of recurring events
2017-05-08 09:49:13 +08:00
Jun Pataleta e8d39b3926 MDL-58803 calendar: Require calendar/lib.php 2017-05-04 13:03:55 +08:00
Andrew Nicols 680ad78cf0 Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle 2017-05-04 10:14:41 +08:00
Jake Dallimore 5529b4701a MDL-58684 portfolio: use file id instead of stored_file 2017-05-04 10:00:54 +08:00
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