Luca Bösch [Fri, 28 Apr 2017 11:35:51 +0000 (13:35 +0200)]
MDL-58756 stats: Use multilang with role.
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:53:28 +0000 (11:53 +0200)]
weekly back-to-dev release 3.4dev
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:35 +0000 (11:46 +0200)]
NOBUG: Change travis.yml back to master
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:34 +0000 (11:46 +0200)]
Moodle release 3.3
Eloy Lafuente (stronk7) [Sun, 14 May 2017 09:46:34 +0000 (11:46 +0200)]
NOBUG: Change travis.yml to MOODLE_33_STABLE
AMOS bot [Sat, 13 May 2017 16:04:26 +0000 (00:04 +0800)]
Automatically generated installer lang files
AMOS bot [Fri, 12 May 2017 16:04:20 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Fri, 12 May 2017 09:02:41 +0000 (10:02 +0100)]
Moodle release 3.3rc3
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
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
Jake Dallimore [Fri, 12 May 2017 07:10:23 +0000 (15:10 +0800)]
MDL-58904 restore: temp fix for event priority notices
Jun Pataleta [Fri, 12 May 2017 06:57:49 +0000 (14:57 +0800)]
Merge branch 'MDL-58905_master' of git://github.com/dmonllao/moodle
David Monllao [Fri, 12 May 2017 05:37:40 +0000 (13:37 +0800)]
MDL-58905 auth_oauth2: Return if no issuers allow login
David Monllao [Fri, 12 May 2017 02:17:06 +0000 (10:17 +0800)]
MDL-58905 auth_oauth2: Add plugin enabled checkings
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
Andrew Nicols [Fri, 12 May 2017 04:32:23 +0000 (12:32 +0800)]
Merge branch 'MDL-58898-master' of https://github.com/xow/moodle
John Okely [Fri, 12 May 2017 04:15:25 +0000 (12:15 +0800)]
MDL-58898 oauth: Cover orphaned linked logins in unit tests
John Okely [Fri, 12 May 2017 03:48:11 +0000 (11:48 +0800)]
MDL-58898 oauth: Remove orphaned linked logins
Jun Pataleta [Fri, 12 May 2017 04:00:52 +0000 (12:00 +0800)]
Merge branch 'MDL-58899-master' of https://github.com/snake/moodle
Jake Dallimore [Fri, 12 May 2017 02:42:40 +0000 (10:42 +0800)]
MDL-58899 auth: improve lang strings for confirmation failures in oauth
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
Andrew Nicols [Fri, 12 May 2017 02:22:19 +0000 (10:22 +0800)]
Merge branch 'MDL-58904' of git://github.com/stronk7/moodle
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.
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
AMOS bot [Thu, 11 May 2017 16:04:11 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Thu, 11 May 2017 13:29:11 +0000 (14:29 +0100)]
MDL-58837 js: fix jsdoc error
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
Marina Glancy [Thu, 11 May 2017 03:54:57 +0000 (11:54 +0800)]
MDL-58837 course: do not confirm deleting empty sections
Marina Glancy [Thu, 11 May 2017 03:42:53 +0000 (11:42 +0800)]
MDL-58837 course: allow to add multiple sections
Jake Dallimore [Thu, 11 May 2017 03:41:48 +0000 (11:41 +0800)]
Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle
AMOS bot [Wed, 10 May 2017 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files
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
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
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
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
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
John Okely [Wed, 10 May 2017 07:34:45 +0000 (15:34 +0800)]
MDL-58874 icons: use table for grades icon in grader report
Marina Glancy [Wed, 10 May 2017 03:11:28 +0000 (11:11 +0800)]
MDL-58867 calendar: avoid fatal errors for non-module events
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.
David Monllao [Wed, 10 May 2017 06:07:46 +0000 (14:07 +0800)]
Merge branch 'MDL-58833-master' of git://github.com/andrewnicols/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
Dan Poltawski [Wed, 10 May 2017 05:56:42 +0000 (06:56 +0100)]
Merge branch 'MDL-58836-master' of git://github.com/damyon/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
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.
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).
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).
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).
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.
Andrew Nicols [Wed, 10 May 2017 03:48:40 +0000 (11:48 +0800)]
Merge branch 'MDL-58780-master' of git://github.com/junpataleta/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
Damyon Wiese [Mon, 8 May 2017 06:42:52 +0000 (14:42 +0800)]
MDL-58774 auth_oauth2: Prevent duplicate linked logins
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
AMOS bot [Tue, 9 May 2017 16:04:43 +0000 (00:04 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 9 May 2017 11:42:23 +0000 (12:42 +0100)]
Moodle release 3.3rc2
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
Jun Pataleta [Tue, 9 May 2017 09:05:39 +0000 (17:05 +0800)]
Merge branch 'MDL-58860-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 9 May 2017 08:17:47 +0000 (09:17 +0100)]
Merge branch 'MDL-58853' of git://github.com/stronk7/moodle
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.
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
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.
Andrew Nicols [Tue, 9 May 2017 05:55:20 +0000 (13:55 +0800)]
Merge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Mon, 8 May 2017 02:14:02 +0000 (02:14 +0000)]
MDL-58822 backup: backup and restore new event columns
Ryan Wyllie [Mon, 8 May 2017 02:13:14 +0000 (02:13 +0000)]
MDL-58822 backup: backup and restore user override events
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
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
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.
Marina Glancy [Tue, 9 May 2017 02:23:53 +0000 (10:23 +0800)]
MDL-58854 theme_boost: override templates for columns
Eloy Lafuente (stronk7) [Tue, 9 May 2017 01:00:48 +0000 (03:00 +0200)]
MDL-58853 versions: main version bump
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
AMOS bot [Mon, 8 May 2017 16:06:30 +0000 (00:06 +0800)]
Automatically generated installer lang files
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
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
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.
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).
Dan Poltawski [Mon, 8 May 2017 09:44:04 +0000 (10:44 +0100)]
Merge branch 'MDL-58414-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
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
Jun Pataleta [Mon, 8 May 2017 08:58:20 +0000 (16:58 +0800)]
Merge branch 'MDL-58771-master' of git://github.com/damyon/moodle
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.
Jun Pataleta [Mon, 8 May 2017 07:50:03 +0000 (15:50 +0800)]
Merge branch 'MDL-58518-master' of git://github.com/ryanwyllie/moodle
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.
Andrew Nicols [Mon, 8 May 2017 07:01:52 +0000 (15:01 +0800)]
MDL-58833 tool_templatelibrary: Skip if directory empty
Damyon Wiese [Mon, 8 May 2017 06:26:44 +0000 (14:26 +0800)]
MDL-58774 auth_oauth2: Cleanup on user delete.
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
Jun Pataleta [Mon, 8 May 2017 05:58:59 +0000 (13:58 +0800)]
Merge branch 'MDL-58704-master' of git://github.com/lameze/moodle
Marina Glancy [Mon, 8 May 2017 01:20:30 +0000 (09:20 +0800)]
MDL-56251 format_weeks: ensure we use 'automaticenddate' default
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.
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.
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
Jake Dallimore [Mon, 8 May 2017 04:26:16 +0000 (12:26 +0800)]
MDL-58684 upgrade: re-run deletion of portfolio_tempdata upgrade step
Marina Glancy [Mon, 8 May 2017 03:35:29 +0000 (11:35 +0800)]
MDL-58784 mod_glossary: student can see his entries before approval
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
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().
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.
David Monllao [Mon, 8 May 2017 01:59:32 +0000 (09:59 +0800)]
Merge branch 'MDL-58810-master' of git://github.com/junpataleta/moodle
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
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.
Jun Pataleta [Thu, 4 May 2017 02:23:38 +0000 (10:23 +0800)]
MDL-58810 calendar: Add coverage for UUID in recurring events
Andrew Nicols [Mon, 8 May 2017 01:32:58 +0000 (09:32 +0800)]
Merge branch 'MDL-58823-master' of git://github.com/jleyva/moodle
AMOS bot [Sun, 7 May 2017 16:05:46 +0000 (00:05 +0800)]
Automatically generated installer lang files