84368 Commits

Author SHA1 Message Date
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
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
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
Andrew Nicols
5e7de08be5 Merge branch 'MDL-58749' of git://github.com/stronk7/moodle 2017-05-05 08:23:27 +08:00
Eloy Lafuente (stronk7)
da60573291 MDL-58772 behat: change step to 3.2 and up alternative 2017-05-05 00:14:31 +02:00
Eloy Lafuente (stronk7)
2df7f223b8 MDL-58749 lang: fix couple of scenarios to use new lang string 2017-05-04 23:46:46 +02:00
Dan Poltawski
97b93cafef Merge branch 'MDL-58725_master' of git://github.com/markn86/moodle 2017-05-04 15:15:35 +01:00
Dan Poltawski
ad587bee83 Merge branch 'MDL-58709-master' of git://github.com/jleyva/moodle 2017-05-04 15:13:05 +01:00
Luca Bösch
e0e70bda35 MDL-58807 block_activity_results: Use multilang in block title
The title passes format_string now.
2017-05-04 11:30:00 +02:00
Dan Poltawski
bf39e7c7aa Merge branch 'MDL-58800-master' of git://github.com/damyon/moodle 2017-05-04 10:00:37 +01:00
Juan Leyva
396395b8d3 MDL-55371 mod_assign: Do not return empty users in get_participant WS
The WS was returning null users making the WS to fail.
2017-05-04 10:09:35 +02:00
Mark Nelson
dbcc8b3153 MDL-58725 course: include selector change notes in format/upgrade.txt 2017-05-04 15:40:55 +08:00
Jun Pataleta
1e324a4a88 Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-04 14:45:08 +08:00
Andrew Nicols
6628153eb3 Merge branch 'MDL-58736-master' of git://github.com/cameron1729/moodle 2017-05-04 14:33:27 +08:00
Andrew Nicols
641af8d17c Merge branch 'MDL-58803-master-fix' of git://github.com/junpataleta/moodle 2017-05-04 14:11:23 +08:00
Simey Lameze
84d4411b01 MDL-58796 mod_quiz: add handling for fontawesome icons 2017-05-04 13:51:14 +08:00
David Monllao
03262b0469 Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle 2017-05-04 13:32:59 +08:00
Andrew Nicols
28bf0a03a7 MDL-56675 cachestore_memcached: Check all connected servers for support 2017-05-04 13:11:07 +08:00
Mark Nelson
c61b3b4a70 MDL-56251 format_weeks: added observers for updating the course end date 2017-05-04 13:08:50 +08:00
Jun Pataleta
e8d39b3926 MDL-58803 calendar: Require calendar/lib.php 2017-05-04 13:03:55 +08:00
Damyon Wiese
00879eca66 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.
2017-05-04 12:57:23 +08:00
David Monllao
175a51c472 Merge branch 'wip-MDL-58594-v2' of https://github.com/marinaglancy/moodle 2017-05-04 12:38:04 +08:00
Cameron Ball
eeb27f03bd
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.
2017-05-04 12:19:35 +08:00
Andrew Nicols
2e3c23b25f Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle 2017-05-04 11:42:38 +08:00
Andrew Nicols
f8633212ee Merge branch 'MDL-58803-master' of git://github.com/junpataleta/moodle 2017-05-04 11:07:37 +08:00
Andrew Nicols
edf1ea10ca Merge branch 'MDL-58431-master' of git://github.com/jleyva/moodle 2017-05-04 11:01:39 +08:00
David Monllao
bde7f06ce8 Merge branch 'MDL-58497-master' of git://github.com/ankitagarwal/moodle 2017-05-04 10:58:36 +08:00
David Monllao
5abd0f6e6f Merge branch 'MDL-56675-master' of git://github.com/andrewnicols/moodle 2017-05-04 10:56:29 +08:00
Andrew Nicols
680ad78cf0 Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle 2017-05-04 10:14:41 +08:00
Jake Dallimore
5529b4701a MDL-58684 portfolio: use file id instead of stored_file 2017-05-04 10:00:54 +08:00
Damyon Wiese
039ff55129 MDL-56251 format_weeks: add new 'automaticenddate' setting 2017-05-04 09:56:51 +08:00
Jun Pataleta
c9d775fc92 MDL-58803 calendar: Use fully qualified name for call to rrule_manager 2017-05-04 08:58:11 +08:00
Andrew Nicols
b1517237ad Merge branch 'MDL-58514-master' of git://github.com/cameron1729/moodle 2017-05-04 08:49:48 +08:00