94101 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
45a8249431 Merge branch 'MDL-63268-master' of https://github.com/lucaboesch/moodle 2019-07-03 00:02:07 +02:00
Sara Arjona
a1f0042e06 Merge branch 'MDL-64614' of git://github.com/stronk7/moodle 2019-07-02 21:21:18 +02:00
Luca Bösch
d4beb21162 MDL-63268 tool_uploadcourse: Keep source course section number. 2019-07-02 19:44:22 +02:00
Eloy Lafuente (stronk7)
b56dad81b7 Merge branch 'MDL-65707-master' of git://github.com/lameze/moodle 2019-07-02 16:40:02 +02:00
Sara Arjona
492b51a349 Merge branch 'MDL-66062' of git://github.com/stronk7/moodle 2019-07-02 15:15:49 +02:00
Sara Arjona
ec089cc4f7 Merge branch 'MDL-65101_master' of git://github.com/markn86/moodle 2019-07-02 14:50:04 +02:00
Eloy Lafuente (stronk7)
3b07f13d52 MDL-66062 travis: Force PHP 7.1.30 to avoid some unit test failures
Make this sticky because current default version (7.1.11)
has a bug with redis-extension outputting information and breaking
tests.
2019-07-02 12:57:52 +02:00
Eloy Lafuente (stronk7)
7384dd3e2c Merge branch 'MDL-65728-master' of git://github.com/rezaies/moodle 2019-07-02 12:13:46 +02:00
Sara Arjona
aa6a50cccc Merge branch 'MDL-65839_master' of git://github.com/dmonllao/moodle 2019-07-02 10:41:35 +02:00
Eloy Lafuente (stronk7)
ca79f78948 Merge branch 'MDL-65853_master' of git://github.com/gjb2048/moodle 2019-07-02 10:25:23 +02:00
Shamim Rezaie
1ba1235eb1 MDL-34411 mod_quiz: Check if the teacher can access the override 2019-07-02 08:54:36 +02:00
Shamim Rezaie
cb64dfbeb1 MDL-34411 groups: copy/paste error in test_groups_user_groups_visible 2019-07-02 08:54:36 +02:00
Shamim Rezaie
ce1fd00203 MDL-34411 mod_quiz: quiz overrides to observe group membership 2019-07-02 08:54:36 +02:00
Damyon Wiese
043b38d580 MDL-64623 glossary: Check the entry id
The entry must match the glossary before you can do any action on it.
2019-07-02 08:54:36 +02:00
Damyon Wiese
ea1ac3c7ef MDL-53689 xmldb: Require a sesskey to load xml
Loading and unloading xml files is not protected from XSS with a sesskey.
2019-07-02 08:54:36 +02:00
Sara Arjona
af1fce5cb9 Merge branch 'MDL-48610-master_always_visible_alphabet_filter' of https://github.com/gmrsagar/moodle 2019-07-02 08:45:56 +02:00
Sara Arjona
7576bcbe9a Merge branch 'MDL-66049-master-workshopnamespace' of git://github.com/mudrd8mz/moodle 2019-07-02 08:28:53 +02:00
Sara Arjona
a3729cbf6b Merge branch 'MDL-65901-master' of https://github.com/lucaboesch/moodle 2019-07-02 08:10:11 +02:00
Jun Pataleta
3e287c3bee Merge branch 'MDL-66022-master-fix' of git://github.com/andrewnicols/moodle 2019-07-02 15:58:51 +10:00
Andrew Nicols
7fdefd3184 MDL-66022 core: subplugins.php moved to json 2019-07-02 15:55:12 +10:00
Eloy Lafuente (stronk7)
671313b32d Merge branch 'MDL-64935-master' of git://github.com/bmbrands/moodle 2019-07-02 00:05:03 +02:00
Eloy Lafuente (stronk7)
d1f430d160 Merge branch 'MDL-66022' of git://github.com/Chocolate-lightning/moodle 2019-07-01 23:55:14 +02:00
Eloy Lafuente (stronk7)
6e990b0c6b Merge branch 'MDL-64511' of https://github.com/paulholden/moodle 2019-07-01 18:52:06 +02:00
Sara Arjona
90f59ece67 Merge branch 'MDL-65297' of https://github.com/paulholden/moodle 2019-07-01 18:34:38 +02:00
Sara Arjona
2233fcbedd Merge branch 'MDL-65892-master-inlinereply' of git://github.com/mudrd8mz/moodle 2019-07-01 15:49:54 +02:00
David Mudrák
2bb03c59e8 MDL-66049 workshop: Fix the fully qualified class name
Because of the missing slash, the class 'workshop' was not found in the
current namespace and the cron failed to work.
2019-07-01 14:48:45 +02:00
Sara Arjona
3ee94b8dee Merge branch 'MDL-65973-master' of git://github.com/jleyva/moodle 2019-07-01 13:13:26 +02:00
Dan Marsden
22dfa6d31d MDL-60347 core: debugsmtp should be a developer only setting. 2019-07-01 12:15:05 +02:00
Sara Arjona
7d12c365ca Merge branch 'MDL-57884' of https://github.com/timhunt/moodle 2019-07-01 09:57:34 +02:00
Eloy Lafuente (stronk7)
a993013a33 MDL-64614 environment: mssql requirement up to 2012 (11.0) 2019-06-29 16:26:36 +02:00
Eloy Lafuente (stronk7)
502d2c8a48 MDL-64614 environment: 3.8 base information
This is a direct copy of the 3.7 branch to have
changes under control easier for next commits.
2019-06-29 11:52:00 +02:00
David Monllaó
39db57c3ee MDL-65839 core_analytics: New indicator instances for each analysable 2019-06-28 21:00:04 +02:00
Paul Holden
b4d999a5a6 MDL-64511 privacy: encode data URL when loading content.
Previously paths that included ? or # characters would break loading.
2019-06-28 13:16:16 +01:00
Paul Holden
8e7b3d4ede MDL-65297 atto_managefiles: improve filename decoding.
Filenames containing # character would previously be missed.
2019-06-28 13:12:04 +01:00
Sara Arjona
5528d03217 Merge branch 'MDL-65506-master' of git://github.com/rezaies/moodle 2019-06-28 12:16:14 +02:00
Mark Nelson
4ad162667d MDL-65101 core_message: add Behat test 2019-06-28 18:12:05 +08:00
Mark Nelson
a9fd9c7909 MDL-65101 core_message: 'canmessage' should trump 'requirescontract' 2019-06-28 14:58:24 +08:00
Gareth Barnard
5f3d948aaf
MDL-65853 format_base: Labels counted in section activity summary. 2019-06-27 23:32:35 +01:00
Luca Bösch
242dad037f MDL-65901 forum: Style advanced search form properly. 2019-06-27 22:00:05 +02:00
Eloy Lafuente (stronk7)
7ec1804935 weekly release 3.8dev 2019-06-27 18:54:22 +02:00
Eloy Lafuente (stronk7)
730e779b0c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-06-27 18:54:19 +02:00
Jake Dallimore
c0cc1ebe85 Merge branch 'MDL-65995' of git://github.com/stronk7/moodle 2019-06-27 13:37:50 +08:00
Andrew Nicols
bf2d94e3c9 Merge branch 'MDL-53778' of https://github.com/stronk7/moodle 2019-06-27 08:35:56 +08:00
Mathew May
e63a35dcff MDL-66022 core: Remove unused subplugin files 2019-06-27 08:18:24 +08:00
Eloy Lafuente (stronk7)
4421d3d127 Merge branch 'MDL-59502-master' of git://github.com/aanabit/moodle 2019-06-27 01:25:13 +02:00
Eloy Lafuente (stronk7)
f88261eb49 Merge branch 'MDL-57632-master' of git://github.com/sarjona/moodle 2019-06-27 01:23:09 +02:00
Eloy Lafuente (stronk7)
ee47095dbb MDL-53778 quiz: ensure completion deps are fulfilled by behat
Behat backgrounds and scenarios must observe the new
interdependencies between quiz completion settings.

This commits just applies that to the tests missing it.
2019-06-27 01:11:43 +02:00
Eloy Lafuente (stronk7)
dcb8f5fefb MDL-53778 quiz: ensure completion deps are fulfilled by generator uses
There are some mod_quiz generator issues where the new chain
of dependencies between completion settings was not being observed.

This patch just ensures that the now 3 chained settings are
enabled together (or new quiz options logic will proceed to
disable them).
2019-06-27 01:11:43 +02:00
Eloy Lafuente (stronk7)
6f5990024c Merge branch 'MDL-66003-master-enfix' of git://github.com/mudrd8mz/moodle 2019-06-26 23:04:18 +02:00
Sara Arjona
bdc12b0bd8 Merge branch 'MDL-65996' of git://github.com/stronk7/moodle 2019-06-26 19:16:07 +02:00