mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-01 06:22:39 +01:00
Code Issues Projects Releases Wiki Activity
84,657 Commits 36 Branches 523 Tags
Commit Graph

84657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Nicols
1d5a366488 Merge branch 'MDL-58684-master-fix1' of https://github.com/snake/moodle 2017-05-08 11:20:39 +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
Damyon Wiese
6a7552fe70 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.
 2017-05-08 10:53:58 +08:00
David Monllao
ac6b845de7 Merge branch 'MDL-58810-master' of git://github.com/junpataleta/moodle 2017-05-08 09:59:32 +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
Eloy Lafuente (stronk7)
8f60a02d5f 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.
 2017-05-08 09:49:10 +08:00
Jun Pataleta
bf57bde20d MDL-58810 calendar: Add coverage for UUID in recurring events 2017-05-08 09:33:47 +08:00
Andrew Nicols
7167d25f5f Merge branch 'MDL-58823-master' of git://github.com/jleyva/moodle 2017-05-08 09:32:58 +08:00
AMOS bot
39861e76b4 Automatically generated installer lang files 2017-05-08 00:05:46 +08:00
AMOS bot
6893b18db0 Automatically generated installer lang files 2017-05-07 00:05:39 +08:00
Eloy Lafuente (stronk7)
48ad73619f Moodle release 3.3rc1 v3.3.0-rc1 2017-05-05 17:40:04 +02:00
Eloy Lafuente (stronk7)
e50f35380c NOBUG: Fixed SVG browser compatibility 2017-05-05 17:40:00 +02:00
Jun Pataleta
e290cf781e Merge branch 'MDL-58535-fix-c' of http://github.com/damyon/moodle 2017-05-05 16:48:23 +08:00
Damyon Wiese
eeaee38a75 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.
 2017-05-05 16:44:52 +08:00
Juan Leyva
fcdd7730bd 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.
 2017-05-05 10:04:51 +02:00
Andrew Nicols
529d52f39a Merge branch 'wip-MDL-50670-master-fix' of https://github.com/marinaglancy/moodle 2017-05-05 14:55:22 +08:00
Marina Glancy
aef5c363d0 MDL-50670 course: apply defaults when format was switched 2017-05-05 14:47:27 +08:00
Jake Dallimore
1d116698c7 Merge branch 'MDL-56251_master' of git://github.com/markn86/moodle 2017-05-05 13:39:57 +08:00
Mark Nelson
50bbb5b254 MDL-56251 format_weeks: fixed broken upgrade when using CLI 2017-05-05 12:55:06 +08:00
Jake Dallimore
7a37f761bc Merge branch 'MDL-56251_master' of git://github.com/markn86/moodle 2017-05-05 12:29:44 +08:00
Mark Nelson
a526c706f4 MDL-56251 core: fixed failing unit tests 2017-05-05 12:14:56 +08:00
Mark Nelson
18557be2c2 MDL-56251 format_weeks: handle restore of < 3.3 backups 2017-05-05 12:14:56 +08:00
Mark Nelson
9f8a15b461 MDL-56251 format_weeks: add upgrade for new 'automaticenddate' setting 2017-05-05 12:14:56 +08:00
Mark Nelson
b0f0200e4f MDL-56251 backup: trigger course_section_created/updated events 2017-05-05 12:14:55 +08:00
Marina Glancy
7aa3925c9a MDL-56251 format_weeks: do not use caches in event observers 2017-05-05 12:14:55 +08:00
Jun Pataleta
33673d89e5 Merge branch 'MDL-58807-activities-result-title-multilang' of https://github.com/lucaboesch/moodle 2017-05-05 12:09:29 +08:00
Jake Dallimore
42a123b1b7 Merge branch 'MDL-58796-master' of git://github.com/lameze/moodle 2017-05-05 12:01:06 +08:00
Juan Leyva
609a10739d 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.
 2017-05-05 10:28:11 +08:00
Andrew Nicols
fbc15bb977 Merge branch 'MDL-55371-master' of git://github.com/jleyva/moodle 2017-05-05 09:57:40 +08:00
Andrew Nicols
c428f58a3a Merge branch 'MDL-58772' of git://github.com/stronk7/moodle 2017-05-05 08:26:26 +08:00