moodle.git
5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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.

5 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).

5 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

5 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

5 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

5 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

5 years agoMerge branch 'MDL-58518-master' of git://github.com/ryanwyllie/moodle
Jun Pataleta [Mon, 8 May 2017 07:50:03 +0000 (15:50 +0800)]
Merge branch 'MDL-58518-master' of git://github.com/ryanwyllie/moodle

5 years agoMDL-58414 boost: Use a flippable CSS rule
Damyon Wiese [Mon, 8 May 2017 07:05:55 +0000 (15:05 +0800)]
MDL-58414 boost: Use a flippable CSS rule

Background position "left" can be flipped to "right" - no problem.
Background position "8px" cannot - because it's always measured from the top left.

5 years agoMerge branch 'MDL-56251_master-fix' of https://github.com/markn86/moodle
Jake Dallimore [Mon, 8 May 2017 06:16:14 +0000 (14:16 +0800)]
Merge branch 'MDL-56251_master-fix' of https://github.com/markn86/moodle

5 years agoMerge branch 'MDL-58704-master' of git://github.com/lameze/moodle
Jun Pataleta [Mon, 8 May 2017 05:58:59 +0000 (13:58 +0800)]
Merge branch 'MDL-58704-master' of git://github.com/lameze/moodle

5 years agoMDL-56251 format_weeks: ensure we use 'automaticenddate' default
Marina Glancy [Mon, 8 May 2017 01:20:30 +0000 (09:20 +0800)]
MDL-56251 format_weeks: ensure we use 'automaticenddate' default

5 years agoMDL-56251 format_weeks: Cannot group by TEXT in Oracle
Eloy Lafuente (stronk7) [Sun, 7 May 2017 14:10:04 +0000 (16:10 +0200)]
MDL-56251 format_weeks: Cannot group by TEXT in Oracle

Perform the grouping in subquery and later
simply join with the table containing the TEXT col.

5 years agoMDL-58771 tinymce: emoticon bug
Damyon Wiese [Mon, 8 May 2017 04:32:26 +0000 (12:32 +0800)]
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.

5 years agoMerge branch 'MDL-58684-master-rerun-upgrade-step' of https://github.com/snake/moodle
Andrew Nicols [Mon, 8 May 2017 04:30:59 +0000 (12:30 +0800)]
Merge branch 'MDL-58684-master-rerun-upgrade-step' of https://github.com/snake/moodle

5 years agoMDL-58684 upgrade: re-run deletion of portfolio_tempdata upgrade step
Jake Dallimore [Mon, 8 May 2017 04:26:16 +0000 (12:26 +0800)]
MDL-58684 upgrade: re-run deletion of portfolio_tempdata upgrade step

5 years agoMDL-58784 mod_glossary: student can see his entries before approval
Marina Glancy [Mon, 8 May 2017 03:35:29 +0000 (11:35 +0800)]
MDL-58784 mod_glossary: student can see his entries before approval

5 years agoMerge branch 'MDL-58684-master-fix1' of https://github.com/snake/moodle
Andrew Nicols [Mon, 8 May 2017 03:20:39 +0000 (11:20 +0800)]
Merge branch 'MDL-58684-master-fix1' of https://github.com/snake/moodle

5 years agoMDL-58684 files: Ensure stored_file never serializes the file_storage
Jake Dallimore [Mon, 8 May 2017 03:12:39 +0000 (11:12 +0800)]
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().

5 years agoMDL-58765 repository: controlled links fix
Damyon Wiese [Mon, 8 May 2017 02:53:58 +0000 (10:53 +0800)]
MDL-58765 repository: controlled links fix

If a file is selected as a controlled link, only copy it to the system account the first time
the form is saved.

5 years agoMerge branch 'MDL-58810-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 8 May 2017 01:59:32 +0000 (09:59 +0800)]
Merge branch 'MDL-58810-master' of git://github.com/junpataleta/moodle

5 years agoMDL-58810 calendar: Fix rrule_manager issues
Jun Pataleta [Thu, 4 May 2017 01:57:51 +0000 (09:57 +0800)]
MDL-58810 calendar: Fix rrule_manager issues

* Set the correct repeat ID for the recurring event
* Unset UUID for 'child' events of recurring events

5 years agoMDL-58704 behat: Restrict search to the target tab (by css_element)
Eloy Lafuente (stronk7) [Sat, 6 May 2017 18:46:58 +0000 (20:46 +0200)]
MDL-58704 behat: Restrict search to the target tab (by css_element)

The existing search is too broad, and the text being searched exists
a number of times in the block, all them hidden, but one (the one
where we want to really check for the existence of the text).

So this patch only changes the search from block to the target
tab, doing it by css element id. Ideally we should be able to
search in tabs more naturally, but we don't have support for that right
now.

5 years agoMDL-58810 calendar: Add coverage for UUID in recurring events
Jun Pataleta [Thu, 4 May 2017 02:23:38 +0000 (10:23 +0800)]
MDL-58810 calendar: Add coverage for UUID in recurring events

5 years agoMerge branch 'MDL-58823-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 8 May 2017 01:32:58 +0000 (09:32 +0800)]
Merge branch 'MDL-58823-master' of git://github.com/jleyva/moodle

5 years agoMoodle release 3.3rc1 v3.3.0-rc1
Eloy Lafuente (stronk7) [Fri, 5 May 2017 15:40:04 +0000 (17:40 +0200)]
Moodle release 3.3rc1

5 years agoNOBUG: Fixed SVG browser compatibility
Eloy Lafuente (stronk7) [Fri, 5 May 2017 15:40:00 +0000 (17:40 +0200)]
NOBUG: Fixed SVG browser compatibility

5 years agoMerge branch 'MDL-58535-fix-c' of http://github.com/damyon/moodle
Jun Pataleta [Fri, 5 May 2017 08:48:23 +0000 (16:48 +0800)]
Merge branch 'MDL-58535-fix-c' of github.com/damyon/moodle

5 years agoMDL-58535 onedrive: Try the upload twice
Damyon Wiese [Fri, 5 May 2017 06:43:40 +0000 (14:43 +0800)]
MDL-58535 onedrive: Try the upload twice

For work accounts we need to specify the auth headers, for personal accounts we cannot specify the auth headers.
We don't know which is which so we have to try both cases.

5 years agoMDL-58823 repository: Fix redirections to external files
Juan Leyva [Fri, 5 May 2017 08:04:51 +0000 (10:04 +0200)]
MDL-58823 repository: Fix redirections to external files

We cannot use redirect() because is not compatible with
webservice/pluginfile.php
This script is defined as an AJAX_SCRIPT so redirections are not
allowed by redirect() function.

5 years agoMerge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle
Andrew Nicols [Fri, 5 May 2017 06:55:22 +0000 (14:55 +0800)]
Merge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle

5 years agoMDL-50670 course: apply defaults when format was switched
Marina Glancy [Fri, 5 May 2017 06:47:27 +0000 (14:47 +0800)]
MDL-50670 course: apply defaults when format was switched

5 years agoMerge branch 'MDL-56251_master' of git://github.com/markn86/moodle
Jake Dallimore [Fri, 5 May 2017 05:39:57 +0000 (13:39 +0800)]
Merge branch 'MDL-56251_master' of git://github.com/markn86/moodle

5 years agoMDL-56251 format_weeks: fixed broken upgrade when using CLI
Mark Nelson [Fri, 5 May 2017 04:55:06 +0000 (12:55 +0800)]
MDL-56251 format_weeks: fixed broken upgrade when using CLI

5 years agoMerge branch 'MDL-56251_master' of git://github.com/markn86/moodle
Jake Dallimore [Fri, 5 May 2017 04:29:44 +0000 (12:29 +0800)]
Merge branch 'MDL-56251_master' of git://github.com/markn86/moodle

5 years agoMDL-56251 core: fixed failing unit tests
Mark Nelson [Thu, 4 May 2017 05:08:31 +0000 (13:08 +0800)]
MDL-56251 core: fixed failing unit tests

5 years agoMDL-56251 format_weeks: handle restore of < 3.3 backups
Mark Nelson [Wed, 3 May 2017 07:49:37 +0000 (15:49 +0800)]
MDL-56251 format_weeks: handle restore of < 3.3 backups

5 years agoMDL-56251 format_weeks: add upgrade for new 'automaticenddate' setting
Mark Nelson [Wed, 3 May 2017 03:26:12 +0000 (11:26 +0800)]
MDL-56251 format_weeks: add upgrade for new 'automaticenddate' setting

5 years agoMDL-56251 backup: trigger course_section_created/updated events
Mark Nelson [Tue, 2 May 2017 05:26:39 +0000 (13:26 +0800)]
MDL-56251 backup: trigger course_section_created/updated events

5 years agoMDL-56251 format_weeks: do not use caches in event observers
Marina Glancy [Wed, 26 Apr 2017 02:32:32 +0000 (10:32 +0800)]
MDL-56251 format_weeks: do not use caches in event observers

5 years agoMerge branch 'MDL-58807-activities-result-title-multilang' of https://github.com...
Jun Pataleta [Fri, 5 May 2017 04:09:29 +0000 (12:09 +0800)]
Merge branch 'MDL-58807-activities-result-title-multilang' of https://github.com/lucaboesch/moodle

5 years agoMerge branch 'MDL-58796-master' of git://github.com/lameze/moodle
Jake Dallimore [Fri, 5 May 2017 04:01:06 +0000 (12:01 +0800)]
Merge branch 'MDL-58796-master' of git://github.com/lameze/moodle

5 years agoMDL-58259 mod_forum: Check create attachment cap in forum_add_attachment
Juan Leyva [Tue, 14 Mar 2017 14:43:11 +0000 (15:43 +0100)]
MDL-58259 mod_forum: Check create attachment cap in forum_add_attachment

We should add the permission check there because this function is used
indirectly by the external API that is not checking for this capability.

5 years agoMerge branch 'MDL-55371-master' of git://github.com/jleyva/moodle
Andrew Nicols [Fri, 5 May 2017 01:57:40 +0000 (09:57 +0800)]
Merge branch 'MDL-55371-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-58772' of git://github.com/stronk7/moodle
Andrew Nicols [Fri, 5 May 2017 00:26:26 +0000 (08:26 +0800)]
Merge branch 'MDL-58772' of git://github.com/stronk7/moodle

5 years agoMerge branch 'MDL-58749' of git://github.com/stronk7/moodle
Andrew Nicols [Fri, 5 May 2017 00:23:27 +0000 (08:23 +0800)]
Merge branch 'MDL-58749' of git://github.com/stronk7/moodle

5 years agoMDL-58772 behat: change step to 3.2 and up alternative
Eloy Lafuente (stronk7) [Thu, 4 May 2017 22:14:31 +0000 (00:14 +0200)]
MDL-58772 behat: change step to 3.2 and up alternative

5 years agoMDL-58749 lang: fix couple of scenarios to use new lang string
Eloy Lafuente (stronk7) [Thu, 4 May 2017 21:46:46 +0000 (23:46 +0200)]
MDL-58749 lang: fix couple of scenarios to use new lang string

5 years agoMerge branch 'MDL-58725_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 4 May 2017 14:15:35 +0000 (15:15 +0100)]
Merge branch 'MDL-58725_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-58709-master' of git://github.com/jleyva/moodle
Dan Poltawski [Thu, 4 May 2017 14:13:05 +0000 (15:13 +0100)]
Merge branch 'MDL-58709-master' of git://github.com/jleyva/moodle

5 years agoMDL-58807 block_activity_results: Use multilang in block title
Luca Bösch [Wed, 3 May 2017 15:49:25 +0000 (17:49 +0200)]
MDL-58807 block_activity_results: Use multilang in block title

The title passes format_string now.

5 years agoMerge branch 'MDL-58800-master' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 4 May 2017 09:00:37 +0000 (10:00 +0100)]
Merge branch 'MDL-58800-master' of git://github.com/damyon/moodle

5 years agoMDL-58688 calendar: retrieve event module without db queries
Marina Glancy [Mon, 24 Apr 2017 06:09:09 +0000 (14:09 +0800)]
MDL-58688 calendar: retrieve event module without db queries

5 years agoMDL-55371 mod_assign: Do not return empty users in get_participant WS
Juan Leyva [Thu, 4 May 2017 08:09:35 +0000 (10:09 +0200)]
MDL-55371 mod_assign: Do not return empty users in get_participant WS

The WS was returning null users making the WS to fail.

5 years agoMDL-58725 course: include selector change notes in format/upgrade.txt
Mark Nelson [Thu, 4 May 2017 07:40:51 +0000 (15:40 +0800)]
MDL-58725 course: include selector change notes in format/upgrade.txt

5 years agoMerge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle
Jun Pataleta [Thu, 4 May 2017 06:45:08 +0000 (14:45 +0800)]
Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle

5 years agoMerge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Thu, 4 May 2017 06:33:27 +0000 (14:33 +0800)]
Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle

5 years agoMerge branch 'MDL-58803-master-fix' of git://github.com/junpataleta/moodle
Andrew Nicols [Thu, 4 May 2017 06:11:23 +0000 (14:11 +0800)]
Merge branch 'MDL-58803-master-fix' of git://github.com/junpataleta/moodle

5 years agoMDL-58796 mod_quiz: add handling for fontawesome icons
Simey Lameze [Wed, 3 May 2017 08:50:49 +0000 (16:50 +0800)]
MDL-58796 mod_quiz: add handling for fontawesome icons

5 years agoMerge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 4 May 2017 05:32:59 +0000 (13:32 +0800)]
Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-56675 cachestore_memcached: Check all connected servers for support
Andrew Nicols [Thu, 4 May 2017 05:09:13 +0000 (13:09 +0800)]
MDL-56675 cachestore_memcached: Check all connected servers for support

5 years agoMDL-56251 format_weeks: added observers for updating the course end date
Mark Nelson [Wed, 19 Apr 2017 04:19:14 +0000 (12:19 +0800)]
MDL-56251 format_weeks: added observers for updating the course end date

5 years agoMDL-58803 calendar: Require calendar/lib.php
Jun Pataleta [Thu, 4 May 2017 03:49:53 +0000 (11:49 +0800)]
MDL-58803 calendar: Require calendar/lib.php

5 years agoMDL-58800 repository_googledocs: Switch oauth clients
Damyon Wiese [Thu, 4 May 2017 04:57:23 +0000 (12:57 +0800)]
MDL-58800 repository_googledocs: Switch oauth clients

We need to ensure we use the correct oauth client to download files. This change
is the same as the one made to the onedrive repository where a usesystem flag
is added to the file reference if the file has been copied to the system account.

5 years agoMerge branch 'wip-MDL-58594-v2' of https://github.com/marinaglancy/moodle
David Monllao [Thu, 4 May 2017 04:38:04 +0000 (12:38 +0800)]
Merge branch 'wip-MDL-58594-v2' of https://github.com/marinaglancy/moodle

5 years agoMDL-58736 core_calendar: Revert calendar_get_events to 3.2 implementation
Cameron Ball [Thu, 4 May 2017 04:09:21 +0000 (12:09 +0800)]
MDL-58736 core_calendar: Revert calendar_get_events to 3.2 implementation

We modified calendar_get_events in a non backwards compatible way
so instead of fixing that, an easier approch is to simply revert
it to the 3.2 implementation. This should be fine since the way
to get events is going to change in an upcomming release, and we
had to swap all occurences of calendar_get_events in core with
calendar_get_legacy_events to make sure the calendar and overview match.

5 years agoMerge branch 'MDL-58707-master' of git://github.com/jleyva/moodle
Andrew Nicols [Thu, 4 May 2017 03:42:38 +0000 (11:42 +0800)]
Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-58803-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Thu, 4 May 2017 03:07:37 +0000 (11:07 +0800)]
Merge branch 'MDL-58803-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-58431-master' of git://github.com/jleyva/moodle
Andrew Nicols [Thu, 4 May 2017 03:01:39 +0000 (11:01 +0800)]
Merge branch 'MDL-58431-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-58497-master' of git://github.com/ankitagarwal/moodle
David Monllao [Thu, 4 May 2017 02:58:36 +0000 (10:58 +0800)]
Merge branch 'MDL-58497-master' of git://github.com/ankitagarwal/moodle

5 years agoMerge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle
David Monllao [Thu, 4 May 2017 02:56:29 +0000 (10:56 +0800)]
Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-58684-master-2' of https://github.com/snake/moodle
Andrew Nicols [Thu, 4 May 2017 02:14:41 +0000 (10:14 +0800)]
Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle

5 years agoMDL-58684 portfolio: use file id instead of stored_file
Jake Dallimore [Mon, 24 Apr 2017 02:20:19 +0000 (10:20 +0800)]
MDL-58684 portfolio: use file id instead of stored_file

5 years agoMDL-56251 format_weeks: add new 'automaticenddate' setting
Damyon Wiese [Tue, 11 Apr 2017 08:10:45 +0000 (16:10 +0800)]
MDL-56251 format_weeks: add new 'automaticenddate' setting

5 years agoMDL-58803 calendar: Use fully qualified name for call to rrule_manager
Jun Pataleta [Thu, 4 May 2017 00:58:11 +0000 (08:58 +0800)]
MDL-58803 calendar: Use fully qualified name for call to rrule_manager

5 years agoMerge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Thu, 4 May 2017 00:49:48 +0000 (08:49 +0800)]
Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle

5 years agoMDL-58749 lang: Change "inline text" to "online text" in qtype_essay
David Mudrák [Wed, 3 May 2017 19:28:23 +0000 (21:28 +0200)]
MDL-58749 lang: Change "inline text" to "online text" in qtype_essay

This change has been agreed by Helen and Tim in MDL-49208.

5 years agoMDL-58749 lang: Merge English strings from the en_fix language pack
Helen Foster [Wed, 3 May 2017 15:32:23 +0000 (17:32 +0200)]
MDL-58749 lang: Merge English strings from the en_fix language pack

Significant string changes:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23
* cron_help,core_admin - updated recommendation to run cron every minute
* tour1_content_end, tour1_content_welcome, tour2_content_end,
  tour2_content_welcome all in tool_usertours - removing reference to
  3.2
* invalidsesskey,core_error and invalidsesskey,mod_wiki - more
  understandable error message
* pluginname_help and pluginnamesummary in qtype_essay - explaining that
  the question type can be used for file uploads
* formatnoinline, mustattach and mustrequire in qtype_essay - changing
  the word 'inline' to 'online'

5 years agoMerge branch 'MDL-58754-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 3 May 2017 17:32:45 +0000 (19:32 +0200)]
Merge branch 'MDL-58754-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 3 May 2017 16:44:38 +0000 (18:44 +0200)]
Merge branch 'MDL-58788-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-58772' of git://github.com/aolley/moodle
Dan Poltawski [Wed, 3 May 2017 15:50:29 +0000 (16:50 +0100)]
Merge branch 'MDL-58772' of git://github.com/aolley/moodle

5 years agoMerge branch 'MDL-35913-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 3 May 2017 13:15:11 +0000 (14:15 +0100)]
Merge branch 'MDL-35913-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-58434-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 3 May 2017 13:01:59 +0000 (14:01 +0100)]
Merge branch 'MDL-58434-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50670_master' of git://github.com/markn86/moodle
Dan Poltawski [Wed, 3 May 2017 12:30:43 +0000 (13:30 +0100)]
Merge branch 'MDL-50670_master' of git://github.com/markn86/moodle

5 years agoMerge branch 'MDL-58794-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Wed, 3 May 2017 12:19:19 +0000 (13:19 +0100)]
Merge branch 'MDL-58794-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-58798-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Wed, 3 May 2017 11:17:13 +0000 (12:17 +0100)]
Merge branch 'MDL-58798-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-58692-master-authcfgnames' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 3 May 2017 10:17:45 +0000 (11:17 +0100)]
Merge branch 'MDL-58692-master-authcfgnames' of git://github.com/mudrd8mz/moodle

5 years agoMDL-58692 auth: Improve the migration of auth setting names
David Mudrák [Tue, 2 May 2017 14:50:08 +0000 (16:50 +0200)]
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.

5 years agoMerge branch 'wip-MDL-58661-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 3 May 2017 09:39:51 +0000 (10:39 +0100)]
Merge branch 'wip-MDL-58661-master' of git://github.com/marinaglancy/moodle

5 years agoMDL-58788 docs: Note new behat compatibility page
Dan Poltawski [Wed, 3 May 2017 08:14:38 +0000 (09:14 +0100)]
MDL-58788 docs: Note new behat compatibility page

5 years agoMDL-58514 mod_assign: Apply consistent logic for overrides
Cameron Ball [Wed, 12 Apr 2017 09:31:00 +0000 (17:31 +0800)]
MDL-58514 mod_assign: Apply consistent logic for overrides

Previously the assign submission page was using "lenient" logic
for overrides when more than one group override applied to a user
(i.e., use the earliest "open" date and the latest "due" date)
when really it should be using the sortorder as per the assign
grading table.