moodle.git
4 years agoMerge branch 'MDL-58756-statslib-roles-multilang' of https://github.com/lucaboesch...
Andrew Nicols [Tue, 16 May 2017 05:52:05 +0000 (13:52 +0800)]
Merge branch 'MDL-58756-statslib-roles-multilang' of https://github.com/lucaboesch/moodle

4 years agoMDL-58756 stats: Use multilang with role.
Luca Bösch [Fri, 28 Apr 2017 11:35:51 +0000 (13:35 +0200)]
MDL-58756 stats: Use multilang with role.

4 years agoMerge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle
David Monllao [Tue, 16 May 2017 02:41:41 +0000 (10:41 +0800)]
Merge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle

4 years agoMerge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle
Jake Dallimore [Tue, 16 May 2017 01:57:05 +0000 (09:57 +0800)]
Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle

4 years agoMerge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 15 May 2017 11:07:13 +0000 (12:07 +0100)]
Merge branch 'MDL-58929-master' of git://github.com/ankitagarwal/moodle

4 years agoMerge branch 'MDL-58936_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 15 May 2017 10:45:17 +0000 (11:45 +0100)]
Merge branch 'MDL-58936_master' of git://github.com/markn86/moodle

4 years agoMerge branch 'MDL-58496-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 15 May 2017 10:14:19 +0000 (11:14 +0100)]
Merge branch 'MDL-58496-master' of git://github.com/cameron1729/moodle

4 years agoMerge branch 'MDL-58916-master' of https://github.com/xow/moodle
Dan Poltawski [Mon, 15 May 2017 10:01:13 +0000 (11:01 +0100)]
Merge branch 'MDL-58916-master' of https://github.com/xow/moodle

4 years agoMerge branch 'MDL-58841-master' of git://github.com/cameron1729/moodle
Dan Poltawski [Mon, 15 May 2017 09:46:00 +0000 (10:46 +0100)]
Merge branch 'MDL-58841-master' of git://github.com/cameron1729/moodle

4 years agoMerge branch 'MDL-58852-choice-chart-options-multilang' of https://github.com/lucaboe...
Dan Poltawski [Mon, 15 May 2017 09:23:02 +0000 (10:23 +0100)]
Merge branch 'MDL-58852-choice-chart-options-multilang' of https://github.com/lucaboesch/moodle

4 years agoMerge branch 'MDL-58932' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 15 May 2017 07:57:09 +0000 (08:57 +0100)]
Merge branch 'MDL-58932' of git://github.com/stronk7/moodle

4 years agoMerge branch 'MDL-58893-master-missing-div' of https://github.com/dmitriim/moodle
Andrew Nicols [Mon, 15 May 2017 07:12:38 +0000 (15:12 +0800)]
Merge branch 'MDL-58893-master-missing-div' of https://github.com/dmitriim/moodle

4 years agoMerge branch 'MDL-58920-calculated-question-edit-name-multilang' of https://github...
Andrew Nicols [Mon, 15 May 2017 05:57:04 +0000 (13:57 +0800)]
Merge branch 'MDL-58920-calculated-question-edit-name-multilang' of https://github.com/lucaboesch/moodle

4 years agoMDL-58893 portfolio: add missing closing div
Dmitrii Metelkin [Thu, 11 May 2017 05:03:35 +0000 (15:03 +1000)]
MDL-58893 portfolio: add missing closing div

4 years agoMDL-58936 core: ensure 'page->context' is not null
Mark Nelson [Mon, 15 May 2017 04:20:15 +0000 (12:20 +0800)]
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.

4 years agoMDL-58929 converters: Make link title consistent
Ankit Agarwal [Mon, 15 May 2017 04:15:09 +0000 (09:45 +0530)]
MDL-58929 converters: Make link title consistent

4 years agoMDL-58916 user_profile: Pass site context when determining menu options
John Okely [Fri, 12 May 2017 07:52:37 +0000 (15:52 +0800)]
MDL-58916 user_profile: Pass site context when determining menu options

4 years agoMDL-58932 backup: Bump release to 3.4
Eloy Lafuente (stronk7) [Sun, 14 May 2017 22:43:40 +0000 (00:43 +0200)]
MDL-58932 backup: Bump release to 3.4

4 years agoMDL-58852 choice: Use multilang for choice options in charts
Luca Bösch [Mon, 8 May 2017 21:14:48 +0000 (23:14 +0200)]
MDL-58852 choice: Use multilang for choice options in charts

4 years agoMDL-58920 questions: Calculated question name passing multilang.
Luca Bösch [Fri, 12 May 2017 11:00:39 +0000 (13:00 +0200)]
MDL-58920 questions: Calculated question name passing multilang.

In "Shared wild cards" table calculated question name do pass format_string to process multilang tags.
Thus, not breaking the layout any more.

4 years agoweekly back-to-dev release 3.4dev
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:53:28 +0000 (11:53 +0200)]
weekly back-to-dev release 3.4dev

4 years agoNOBUG: Change travis.yml back to master
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:35 +0000 (11:46 +0200)]
NOBUG: Change travis.yml back to master

4 years agoMoodle release 3.3 v3.3.0
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:34 +0000 (11:46 +0200)]
Moodle release 3.3

4 years agoNOBUG: Change travis.yml to MOODLE_33_STABLE
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:34 +0000 (11:46 +0200)]
NOBUG: Change travis.yml to MOODLE_33_STABLE

4 years agoAutomatically generated installer lang files
AMOS bot [Sat, 13 May 2017 16:04:26 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoAutomatically generated installer lang files
AMOS bot [Fri, 12 May 2017 16:04:20 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMoodle release 3.3rc3 v3.3.0-rc3
Dan Poltawski [Fri, 12 May 2017 09:02:41 +0000 (10:02 +0100)]
Moodle release 3.3rc3

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 12 May 2017 09:02:40 +0000 (10:02 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMerge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle
Dan Poltawski [Fri, 12 May 2017 07:19:07 +0000 (08:19 +0100)]
Merge branch 'MDL-58904-master-fix' of https://github.com/snake/moodle

4 years agoMDL-58904 restore: temp fix for event priority notices
Jake Dallimore [Fri, 12 May 2017 07:10:23 +0000 (15:10 +0800)]
MDL-58904 restore: temp fix for event priority notices

4 years agoMerge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle
Jun Pataleta [Fri, 12 May 2017 06:57:49 +0000 (14:57 +0800)]
Merge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle

4 years agoMDL-58905 auth_oauth2: Return if no issuers allow login
David Monllao [Fri, 12 May 2017 05:37:40 +0000 (13:37 +0800)]
MDL-58905 auth_oauth2: Return if no issuers allow login

4 years agoMDL-58905 auth_oauth2: Add plugin enabled checkings
David Monllao [Fri, 12 May 2017 02:17:06 +0000 (10:17 +0800)]
MDL-58905 auth_oauth2: Add plugin enabled checkings

4 years agoMDL-58905 auth_oauth2: No linked accounts if the plugin is not enabled
David Monllao [Fri, 12 May 2017 02:07:46 +0000 (10:07 +0800)]
MDL-58905 auth_oauth2: No linked accounts if the plugin is not enabled

4 years agoMerge branch 'MDL-58898-master' of https://github.com/xow/moodle
Andrew Nicols [Fri, 12 May 2017 04:32:23 +0000 (12:32 +0800)]
Merge branch 'MDL-58898-master' of https://github.com/xow/moodle

4 years agoMDL-58898 oauth: Cover orphaned linked logins in unit tests
John Okely [Fri, 12 May 2017 04:15:25 +0000 (12:15 +0800)]
MDL-58898 oauth: Cover orphaned linked logins in unit tests

4 years agoMDL-58898 oauth: Remove orphaned linked logins
John Okely [Fri, 12 May 2017 03:48:11 +0000 (11:48 +0800)]
MDL-58898 oauth: Remove orphaned linked logins

4 years agoMerge branch 'MDL-58899-master' of https://github.com/snake/moodle
Jun Pataleta [Fri, 12 May 2017 04:00:52 +0000 (12:00 +0800)]
Merge branch 'MDL-58899-master' of https://github.com/snake/moodle

4 years agoMDL-58899 auth: improve lang strings for confirmation failures in oauth
Jake Dallimore [Fri, 12 May 2017 02:42:40 +0000 (10:42 +0800)]
MDL-58899 auth: improve lang strings for confirmation failures in oauth

4 years agoMerge branch 'MDL-58774-master-fix' of git://github.com/andrewnicols/moodle
David Monllao [Fri, 12 May 2017 03:07:42 +0000 (11:07 +0800)]
Merge branch 'MDL-58774-master-fix' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-58904' of git://github.com/stronk7/moodle
Andrew Nicols [Fri, 12 May 2017 02:22:19 +0000 (10:22 +0800)]
Merge branch 'MDL-58904' of git://github.com/stronk7/moodle

4 years agoMDL-58774 auth_oauth2: Only check unexpired accounts for same issuer
Andrew Nicols [Thu, 11 May 2017 22:44:43 +0000 (06:44 +0800)]
MDL-58774 auth_oauth2: Only check unexpired accounts for same issuer

It shoudl be possible to link multiple OAuth2 sources which have the
same e-mail address to an account.

This patch makes the check for an existing linked account stricter so
that it only checks for linked account records which match the same
issuer, and which do not have expired confirmation tokens.

4 years agoMDL-58904 backup: old backups do not contain new fields
Eloy Lafuente (stronk7) [Thu, 11 May 2017 17:55:21 +0000 (19:55 +0200)]
MDL-58904 backup: old backups do not contain new fields

Hence we need to apply DB defaults for them when missing:

  - type = 0
  - timesort = null

4 years agoAutomatically generated installer lang files
AMOS bot [Thu, 11 May 2017 16:04:11 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMDL-58837 js: fix jsdoc error
Dan Poltawski [Thu, 11 May 2017 13:29:11 +0000 (14:29 +0100)]
MDL-58837 js: fix jsdoc error

4 years agoMerge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 11 May 2017 13:26:33 +0000 (14:26 +0100)]
Merge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle

4 years agoMDL-58837 course: do not confirm deleting empty sections
Marina Glancy [Thu, 11 May 2017 03:54:57 +0000 (11:54 +0800)]
MDL-58837 course: do not confirm deleting empty sections

4 years agoMDL-58837 course: allow to add multiple sections
Marina Glancy [Thu, 11 May 2017 03:42:53 +0000 (11:42 +0800)]
MDL-58837 course: allow to add multiple sections

4 years agoMerge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle
Jake Dallimore [Thu, 11 May 2017 03:41:48 +0000 (11:41 +0800)]
Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle

4 years agoMDL-58884 competency: Inaccurate stats proficient competencies in course
Issam Taboubi [Wed, 10 May 2017 17:24:00 +0000 (13:24 -0400)]
MDL-58884 competency: Inaccurate stats proficient competencies in course

4 years agoAutomatically generated installer lang files
AMOS bot [Wed, 10 May 2017 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-58874-master' of https://github.com/xow/moodle
Eloy Lafuente (stronk7) [Wed, 10 May 2017 11:31:24 +0000 (13:31 +0200)]
Merge branch 'MDL-58874-master' of https://github.com/xow/moodle

4 years agoMerge branch 'MDL-58877-master-enfix' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 10 May 2017 11:01:08 +0000 (12:01 +0100)]
Merge branch 'MDL-58877-master-enfix' of git://github.com/mudrd8mz/moodle

4 years agoMDL-58877 lang: Merge English strings from the en_fix language pack
Helen Foster [Wed, 10 May 2017 09:40:40 +0000 (11:40 +0200)]
MDL-58877 lang: Merge English strings from the en_fix language pack

Significant string changes:

* loginerror_cannotcreateaccounts in auth_oauth2 - more understandable
  error message
* config_keep_groups_and_groupings and config_keep_roles_and_enrolments
  in core_backup - switch fix

4 years agoMerge branch 'wip-MDL-58867-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 10 May 2017 10:16:19 +0000 (11:16 +0100)]
Merge branch 'wip-MDL-58867-master' of git://github.com/marinaglancy/moodle

4 years agoMDL-58874 icons: Change the icon for grade in course completion report
John Okely [Wed, 10 May 2017 07:38:40 +0000 (15:38 +0800)]
MDL-58874 icons: Change the icon for grade in course completion report

4 years agoMDL-58874 icons: use table for grades icon in grader report
John Okely [Wed, 10 May 2017 07:34:45 +0000 (15:34 +0800)]
MDL-58874 icons: use table for grades icon in grader report

4 years agoMDL-58867 calendar: avoid fatal errors for non-module events
Marina Glancy [Wed, 10 May 2017 03:11:28 +0000 (11:11 +0800)]
MDL-58867 calendar: avoid fatal errors for non-module events

4 years agoMDL-58777 core: Remove redundant refresh events tasks
Cameron Ball [Tue, 2 May 2017 06:51:57 +0000 (14:51 +0800)]
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.

4 years agoMerge branch 'MDL-58833-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 10 May 2017 06:07:46 +0000 (14:07 +0800)]
Merge branch 'MDL-58833-master' of git://github.com/andrewnicols/moodle

4 years agoMerge branch 'MDL-58843-master-exchandler' of git://github.com/mudrd8mz/moodle
David Monllao [Wed, 10 May 2017 06:05:51 +0000 (14:05 +0800)]
Merge branch 'MDL-58843-master-exchandler' of git://github.com/mudrd8mz/moodle

4 years agoMerge branch 'MDL-58836-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 10 May 2017 05:56:42 +0000 (06:56 +0100)]
Merge branch 'MDL-58836-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'MDL-58857-master' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 10 May 2017 05:50:10 +0000 (13:50 +0800)]
Merge branch 'MDL-58857-master' of git://github.com/andrewnicols/moodle

4 years agoMDL-58777 mod_assign: Remove unnecessary upgrade step
Cameron Ball [Mon, 8 May 2017 03:37:12 +0000 (11:37 +0800)]
MDL-58777 mod_assign: Remove unnecessary upgrade step

This upgrade step was setting the priority field for assign events
in the events table. This is redundant since we queue a task to
refresh all events.

This patch also removes a redundant refresh_events task that is
queued from assign.

4 years agoMDL-58777 mod_assign: Explicitly sort records and set event priority
Cameron Ball [Fri, 5 May 2017 08:46:22 +0000 (16:46 +0800)]
MDL-58777 mod_assign: Explicitly sort records and set event priority

The assign update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).

4 years agoMDL-58777 mod_lesson: Explicitly sort records and set event priority
Cameron Ball [Fri, 5 May 2017 08:44:52 +0000 (16:44 +0800)]
MDL-58777 mod_lesson: Explicitly sort records and set event priority

The lesson update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).

4 years agoMDL-58777 mod_quiz: Explicitly sort records and set event priority
Cameron Ball [Fri, 5 May 2017 08:42:12 +0000 (16:42 +0800)]
MDL-58777 mod_quiz: Explicitly sort records and set event priority

The quiz update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.

There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).

4 years agoMDL-58777 core: Use component_callback in refresh events task
Cameron Ball [Tue, 2 May 2017 06:45:58 +0000 (14:45 +0800)]
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.

4 years agoMerge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Wed, 10 May 2017 03:48:40 +0000 (11:48 +0800)]
Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle

4 years agoMerge branch 'MDL-58774-master' of git://github.com/damyon/moodle
David Monllao [Wed, 10 May 2017 02:43:58 +0000 (10:43 +0800)]
Merge branch 'MDL-58774-master' of git://github.com/damyon/moodle

4 years agoMDL-58774 auth_oauth2: Prevent duplicate linked logins
Damyon Wiese [Mon, 8 May 2017 06:42:52 +0000 (14:42 +0800)]
MDL-58774 auth_oauth2: Prevent duplicate linked logins

4 years agoMerge branch 'wip-MDL-58854-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 10 May 2017 00:09:02 +0000 (02:09 +0200)]
Merge branch 'wip-MDL-58854-master' of git://github.com/marinaglancy/moodle

4 years agoAutomatically generated installer lang files
AMOS bot [Tue, 9 May 2017 16:04:43 +0000 (00:04 +0800)]
Automatically generated installer lang files

4 years agoMoodle release 3.3rc2 v3.3.0-rc2
Dan Poltawski [Tue, 9 May 2017 11:42:23 +0000 (12:42 +0100)]
Moodle release 3.3rc2

4 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Tue, 9 May 2017 11:42:19 +0000 (12:42 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

4 years agoMerge branch 'MDL-58860-master' of git://github.com/jleyva/moodle
Jun Pataleta [Tue, 9 May 2017 09:05:39 +0000 (17:05 +0800)]
Merge branch 'MDL-58860-master' of git://github.com/jleyva/moodle

4 years agoMerge branch 'MDL-58853' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 9 May 2017 08:17:47 +0000 (09:17 +0100)]
Merge branch 'MDL-58853' of git://github.com/stronk7/moodle

4 years agoMDL-58860 mod_lesson: Fix get_attempts_overview for no attempts
Juan Leyva [Tue, 9 May 2017 07:38:25 +0000 (09:38 +0200)]
MDL-58860 mod_lesson: Fix get_attempts_overview for no attempts

WS get_attempts_overview was failing when there weren’t attempts in the
given assignment.

4 years agoMDL-58841 mod_assign: Style "view all" link on grading summary
Cameron Ball [Tue, 9 May 2017 07:04:55 +0000 (15:04 +0800)]
MDL-58841 mod_assign: Style "view all" link on grading summary

4 years agoMDL-58857 admin: Terminate the session if a major upgrade is required
Andrew Nicols [Tue, 9 May 2017 07:00:00 +0000 (15:00 +0800)]
MDL-58857 admin: Terminate the session if a major upgrade is required

4 years agoMDL-58843 core: Do not expect a particular class of the thrown exception
David Mudrák [Mon, 8 May 2017 10:47:14 +0000 (12:47 +0200)]
MDL-58843 core: Do not expect a particular class of the thrown exception

Since PHP 7, the custom exception handlers are also called to handle
thrown Errors which are not Exceptions.

4 years agoMerge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Tue, 9 May 2017 05:55:20 +0000 (13:55 +0800)]
Merge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle

4 years agoMDL-58822 backup: backup and restore new event columns
Ryan Wyllie [Mon, 8 May 2017 02:14:02 +0000 (02:14 +0000)]
MDL-58822 backup: backup and restore new event columns

4 years agoMDL-58822 backup: backup and restore user override events
Ryan Wyllie [Mon, 8 May 2017 02:13:14 +0000 (02:13 +0000)]
MDL-58822 backup: backup and restore user override events

4 years agoMerge branch 'MDL-56251_master-fix2' of https://github.com/markn86/moodle
Jake Dallimore [Tue, 9 May 2017 05:13:58 +0000 (13:13 +0800)]
Merge branch 'MDL-56251_master-fix2' of https://github.com/markn86/moodle

4 years agoMDL-56251 format_weeks: do not overwrite end date for pre 3.3 backups
Mark Nelson [Tue, 9 May 2017 04:35:14 +0000 (12:35 +0800)]
MDL-56251 format_weeks: do not overwrite end date for pre 3.3 backups

4 years agoMDL-58780 mod_assign: Remove AS keyword in table alias
Jun Pataleta [Tue, 9 May 2017 03:57:02 +0000 (11:57 +0800)]
MDL-58780 mod_assign: Remove AS keyword in table alias

* The AS keyword is not recognised by Oracle for table aliases.
This is okay with other databases, but optional, so better to
remove it.

4 years agoMDL-58854 theme_boost: override templates for columns
Marina Glancy [Tue, 9 May 2017 02:23:53 +0000 (10:23 +0800)]
MDL-58854 theme_boost: override templates for columns

4 years agoMDL-58853 versions: main version bump
Eloy Lafuente (stronk7) [Tue, 9 May 2017 01:00:48 +0000 (03:00 +0200)]
MDL-58853 versions: main version bump

4 years agoMDL-58853 versions: bump all versions and requires near release
Eloy Lafuente (stronk7) [Tue, 9 May 2017 00:58:28 +0000 (02:58 +0200)]
MDL-58853 versions: bump all versions and requires near release

version = 2017051500 release version
requires= 2017050500 current rc1 version

4 years agoAutomatically generated installer lang files
AMOS bot [Mon, 8 May 2017 16:06:30 +0000 (00:06 +0800)]
Automatically generated installer lang files

4 years agoMerge branch 'MDL-58793-master-authcfgskip' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 8 May 2017 13:46:26 +0000 (14:46 +0100)]
Merge branch 'MDL-58793-master-authcfgskip' of git://github.com/mudrd8mz/moodle

4 years agoMerge branch 'wip-MDL-58784-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 8 May 2017 11:06:32 +0000 (12:06 +0100)]
Merge branch 'wip-MDL-58784-master' of git://github.com/marinaglancy/moodle

4 years agoMDL-58793 auth: Do not report migrated settings as new ones on upgrade
David Mudrák [Thu, 4 May 2017 09:24:03 +0000 (11:24 +0200)]
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.

4 years agoMDL-58793 auth: Fix invalid access to $this in settings.php files
David Mudrák [Thu, 4 May 2017 08:46:15 +0000 (10:46 +0200)]
MDL-58793 auth: Fix invalid access to $this in settings.php files

It has never been guaranteed that settings.php would always be included
from inside the core\plugininfo\auth::load_settings() scope only.
Alternative fix would be to use $plugininfo->name but I think it is
better to be explicit here (same as we are explicit with setting names,
strings etc).

4 years agoMerge branch 'MDL-58414-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 8 May 2017 09:44:04 +0000 (10:44 +0100)]
Merge branch 'MDL-58414-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'MDL-58765-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 8 May 2017 09:31:59 +0000 (10:31 +0100)]
Merge branch 'MDL-58765-master' of git://github.com/damyon/moodle

4 years agoMerge branch 'wip-MDL-58688-master-c' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 8 May 2017 09:31:37 +0000 (10:31 +0100)]
Merge branch 'wip-MDL-58688-master-c' of git://github.com/marinaglancy/moodle

4 years agoMerge branch 'MDL-58771-master' of git://github.com/damyon/moodle
Jun Pataleta [Mon, 8 May 2017 08:58:20 +0000 (16:58 +0800)]
Merge branch 'MDL-58771-master' of git://github.com/damyon/moodle

4 years agoMDL-58836 auth: Improve backwards compatibility
Damyon Wiese [Mon, 8 May 2017 08:14:01 +0000 (16:14 +0800)]
MDL-58836 auth: Improve backwards compatibility

Auth plugins with custom signup forms may not be using renderables / renderers - or
even if they are they may return a renderable that can only be rendered with the renderer from the auth
plugin.

This change checks if the signup form is a renderable - if so try the plugin renderer or fall back on the general renderer.
Otherwise call display() from the mform which is the previous way of rendering an mform.