Commit graph

84585 commits

Author SHA1 Message Date
David Monllao
265a1eafc5 Merge branch 'MDL-58857-master' of git://github.com/andrewnicols/moodle 2017-05-10 13:50:10 +08:00
Cameron Ball
9eb5a0417c
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.
2017-05-10 13:41:18 +08:00
Cameron Ball
56d1ddd775
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).
2017-05-10 13:41:18 +08:00
Cameron Ball
8dada7e334
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).
2017-05-10 13:41:18 +08:00
Cameron Ball
4133df6fd6
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).
2017-05-10 13:41:18 +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
Andrew Nicols
865e2bc7dc Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle 2017-05-10 11:48:40 +08:00
David Monllao
396ae85082 Merge branch 'MDL-58774-master' of git://github.com/damyon/moodle 2017-05-10 10:43:58 +08:00
Damyon Wiese
4f705f5d0d MDL-58774 auth_oauth2: Prevent duplicate linked logins 2017-05-10 10:17:56 +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
AMOS bot
6f41250d82 Automatically generated installer lang files 2017-05-10 00:04:43 +08:00
Dan Poltawski
b16603770b Moodle release 3.3rc2 2017-05-09 12:42:23 +01:00
Dan Poltawski
ac1a8f7de1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-09 12:42:19 +01:00
Jun Pataleta
834da9a30f Merge branch 'MDL-58860-master' of git://github.com/jleyva/moodle 2017-05-09 17:05:39 +08:00
Dan Poltawski
cd501e12c6 Merge branch 'MDL-58853' of git://github.com/stronk7/moodle 2017-05-09 09:17:47 +01:00
Juan Leyva
b50ff71052 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.
2017-05-09 10:03:39 +02:00
Cameron Ball
15fbd9057e
MDL-58841 mod_assign: Style "view all" link on grading summary 2017-05-09 15:04:55 +08:00
Andrew Nicols
a011effb49 MDL-58857 admin: Terminate the session if a major upgrade is required 2017-05-09 15:00:00 +08:00
David Mudrák
8a9785a036 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.
2017-05-09 08:41:41 +02:00
Andrew Nicols
381db2fe8d Merge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle 2017-05-09 13:55:20 +08:00
Ryan Wyllie
a1ded17074 MDL-58822 backup: backup and restore new event columns 2017-05-09 05:48:40 +00:00
Ryan Wyllie
9e452e35d0 MDL-58822 backup: backup and restore user override events 2017-05-09 05:48:40 +00:00
Jake Dallimore
977a01c334 Merge branch 'MDL-56251_master-fix2' of https://github.com/markn86/moodle 2017-05-09 13:13:58 +08:00
Mark Nelson
6bee596079 MDL-56251 format_weeks: do not overwrite end date for pre 3.3 backups 2017-05-09 12:44:48 +08:00
Jun Pataleta
b5c24c99a0 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.
2017-05-09 11:58: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)
254d2cf46e MDL-58853 versions: main version bump 2017-05-09 03:00:48 +02: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
AMOS bot
d7345a357d Automatically generated installer lang files 2017-05-09 00:06:30 +08:00
Dan Poltawski
1595500ffe Merge branch 'MDL-58793-master-authcfgskip' of git://github.com/mudrd8mz/moodle 2017-05-08 14:46:26 +01:00
Dan Poltawski
5da6b0f18b Merge branch 'wip-MDL-58784-master' of git://github.com/marinaglancy/moodle 2017-05-08 12:06:32 +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
David Mudrák
9f29e45e15 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).
2017-05-08 11:47:29 +02:00
Dan Poltawski
69015dd052 Merge branch 'MDL-58414-master' of git://github.com/damyon/moodle 2017-05-08 10:44:04 +01:00
Dan Poltawski
e18cd34bbb Merge branch 'MDL-58765-master' of git://github.com/damyon/moodle 2017-05-08 10:31:59 +01:00
Dan Poltawski
3cc5abc163 Merge branch 'wip-MDL-58688-master-c' of git://github.com/marinaglancy/moodle 2017-05-08 10:31:37 +01: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
406b92c6fd 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.
2017-05-08 16:14:01 +08:00
Jun Pataleta
472cae12a6 Merge branch 'MDL-58518-master' of git://github.com/ryanwyllie/moodle 2017-05-08 15:50:03 +08:00
Damyon Wiese
d9c7ab818a 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.
2017-05-08 15:05:55 +08:00
Andrew Nicols
89ab16414a MDL-58833 tool_templatelibrary: Skip if directory empty 2017-05-08 15:01:52 +08:00
Damyon Wiese
e0abc2e405 MDL-58774 auth_oauth2: Cleanup on user delete. 2017-05-08 14:26:44 +08:00
Jake Dallimore
99e9d9ef64 Merge branch 'MDL-56251_master-fix' of https://github.com/markn86/moodle 2017-05-08 14:16:14 +08:00
Jun Pataleta
d36377804e Merge branch 'MDL-58704-master' of git://github.com/lameze/moodle 2017-05-08 13:58:59 +08:00
Marina Glancy
cee8c18b42 MDL-56251 format_weeks: ensure we use 'automaticenddate' default 2017-05-08 13:28:02 +08:00
Eloy Lafuente (stronk7)
b7b97f1d72 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.
2017-05-08 13:27:50 +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
Andrew Nicols
5d9c1b2f8e Merge branch 'MDL-58684-master-rerun-upgrade-step' of https://github.com/snake/moodle 2017-05-08 12:30:59 +08:00
Jake Dallimore
021a143914 MDL-58684 upgrade: re-run deletion of portfolio_tempdata upgrade step 2017-05-08 12:26:16 +08:00
Marina Glancy
7b14c50bb0 MDL-58784 mod_glossary: student can see his entries before approval 2017-05-08 11:35:29 +08:00