24193 Commits

Author SHA1 Message Date
Andrew Nicols
6fa6e63129 Merge branch 'wip-MDL-60195-master' of git://github.com/abgreeve/moodle 2017-10-12 14:34:05 +08:00
Ankit Agarwal
de6ad82f2c MDL-60288 libraries: Upgrade spout to 2.7.3 2017-10-12 11:32:15 +05:30
Jake Dallimore
7f1b75ba04 MDL-59106 analytics: whitespace fixes 2017-10-12 12:31:56 +08:00
Andrew Nicols
e61ad18e70 Merge branch 'MDL-55356-master' of https://github.com/sammarshallou/moodle 2017-10-12 11:28:04 +08:00
Jake Dallimore
0ce9026307 Merge branch 'MDL-59106_master' of git://github.com/markn86/moodle 2017-10-12 10:53:20 +08:00
Eloy Lafuente (stronk7)
9ead15b629 MDL-60291 libraries: bump readme to actual versions 2017-10-12 00:47:22 +02:00
Eloy Lafuente (stronk7)
5fab66aad8 Merge branch 'MDL-60291-master' of git://github.com/ankitagarwal/moodle 2017-10-12 00:42:57 +02:00
sam marshall
74b7a42d0d MDL-55356 core_search: Make indexing task/CLI do context requests 2017-10-11 17:17:10 +01:00
sam marshall
eacb2bd11b MDL-55356 core_search: API to queue contexts for indexing
New API \core_search\manager::request_index($context, $areaid = '')
adds the given context to a list which is intended to be indexed
later by the scheduled task.
2017-10-11 17:17:07 +01:00
sam marshall
d761b3fb19 MDL-55356 core_search: API to check if indexing enabled
New function \core_search\manager::is_indexing_enabled(), analagous
to existing is_global_search_enabled().

This replaces existing duplicated code, ready for more use in
following commits.
2017-10-11 17:17:06 +01:00
Damyon Wiese
f4594a22ec Merge branch 'MDL-37361-master-revised' of https://github.com/snake/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2017-10-10 17:32:47 +08:00
Jake Dallimore
8fbc41d8d5 MDL-37361 completion: minor code fixes. 2017-10-10 17:12:09 +08:00
Jake Dallimore
86f359bf68 MDL-37361 completion: automatic completion disabled when overridden
Changes:
- Activities with auto completion and a completion status overridden to
COMPLETION_COMPLETE are no longer processed by normal completion
triggers.
- All activities can still be completed by students when their
completion status has been overridden to COMPLETION_INCOMPLETE, via
either auto or manual triggers.
- Completion unit tests updated
2017-10-10 17:10:49 +08:00
Eiz Eddin Al Katrib
60a6b36cd5 MDL-37361 completion: Modified and Added phpunit tests 2017-10-10 17:10:37 +08:00
Eiz Eddin Al Katrib
a39918daae MDL-37361 completion: Enabled overriding activity completion status 2017-10-10 17:10:15 +08:00
Jun Pataleta
37dcdf2202 Merge branch 'wip-MDL-58546-master' of git://github.com/marinaglancy/moodle 2017-10-10 15:26:38 +08:00
Andrew Nicols
c8ee0b642d Merge branch 'MDL-35429-master' of https://github.com/snake/moodle 2017-10-10 14:48:19 +08:00
Mark Nelson
a475e0fe79 MDL-45730 core: added unit tests for new events 2017-10-10 13:15:18 +08:00
Damyon Wiese
93effd739f Merge branch 'MDL-59889-master' of git://github.com/Dagefoerde/moodle 2017-10-10 13:05:31 +08:00
Andrew Nicols
69ed35c92a Merge branch 'MDL-59694_master' of git://github.com/dmonllao/moodle 2017-10-10 11:37:49 +08:00
Jun Pataleta
d63c2d35ec Merge branch 'MDL-60205_group_hiding_clean' of git://github.com/davosmith/moodle 2017-10-10 11:08:06 +08:00
Jun Pataleta
658982416c Merge branch 'MDL-60238-master' of git://github.com/ankitagarwal/moodle 2017-10-10 10:47:37 +08:00
Marina Glancy
b47fda7191 MDL-60029 core_user: new api functions rearranged 2017-10-10 10:34:55 +08:00
Jun Pataleta
7106ac6b15 Merge branch 'MDL-60275_master' of git://github.com/dmonllao/moodle 2017-10-10 10:10:09 +08:00
Adam Olley
d12ac53512 MDL-60320 icons: Use PNG icons as the preview thumbnails
Without this change, Moodle fails to provide any data when requesting a
thumbnail for a non-image file as its looking to provide a SVG file that
doesn't exist.
2017-10-10 09:57:17 +10:30
Eloy Lafuente (stronk7)
4c54ac22d3 Merge branch 'm34_MDL-60318_Undefined_method_file_storage-move_to_trash' of https://github.com/scara/moodle 2017-10-09 23:11:08 +02:00
Eloy Lafuente (stronk7)
eda8027541 Merge branch 'MDL-59811-master' of git://github.com/junpataleta/moodle 2017-10-09 19:52:56 +02:00
John Ehringer
6d242b28e6 MDL-45730 core: Adding events to user profile field and categories CRUD. 2017-10-09 18:58:36 +08:00
Mike Churchward
860f59b13c MDL-60029 core_user: Added new api function to reduce db calls. 2017-10-09 14:10:38 +08:00
Andrew Nicols
f3500bda4e Merge branch 'MDL-59844-master' of git://github.com/Dagefoerde/moodle 2017-10-09 13:58:49 +08:00
David Monllao
dd13fc222c MDL-59694 analytics: Track processed analysables 2017-10-09 07:47:28 +02:00
Andrew Nicols
2e30e9aa0d Merge branch 'wip-MDL-55652-master' of git://github.com/marinaglancy/moodle 2017-10-09 12:42:53 +08:00
Andrew Nicols
bf02f2e91c MDL-60373 core: Do not show title if there is no title 2017-10-09 11:38:00 +08:00
Andrew Nicols
5be48c4514 MDL-59897 accesslib: Remove unused reset 2017-10-09 10:37:19 +08:00
Andrew Nicols
6ba5f93ea6 Merge branch 'MDL-59897-master' of https://github.com/sammarshallou/moodle 2017-10-09 10:31:34 +08:00
Jake Dallimore
54945fa728 MDL-35429 roles: teachers and managers can restore automated backups
Changes the default for the 'moodle/restore:viewautomatedfilearea'
cap from 'Not set' to 'Allow' for the teacher and manager role
archetypes.
2017-10-09 10:29:07 +08:00
Jake Dallimore
521d900f06 MDL-35429 restore: fixed downloading of automated backup files 2017-10-09 10:29:07 +08:00
Jun Pataleta
4047fccba7 MDL-59811 enrol: Move get_user_enrolment_actions logic to parent class
* These duplicated implementations can be simplified where the logic
  can be moved to enrol_plugin::get_user_enrolment_actions() method
  itself.
2017-10-09 10:29:02 +08:00
Marina Glancy
0b844a8322 MDL-60314 navigation: fix overriding variable value 2017-10-09 10:18:00 +08:00
Andrew Nicols
9f2bb19a47 Merge branch 'MDL-60012_form_neq_regression' of git://github.com/davosmith/moodle 2017-10-09 10:13:30 +08:00
Marina Glancy
906e3fcf6e MDL-60237 libraries: TCPDF apply patch for PHP7.2 2017-10-09 10:02:56 +08:00
Marina Glancy
cbc8560718 MDL-60237 libraries: upgrade TCPDF to 6.2.13 2017-10-09 10:02:56 +08:00
Adrian Greeve
dc9c4c5141 MDL-60286 lib: Moodle additions to mustache.js 2017-10-09 09:43:47 +08:00
Adrian Greeve
5adc70b77a MDL-60286 lib: Upgrade mustache.js to 2.3.0 2017-10-09 09:43:47 +08:00
Adrian Greeve
703baed252 MDL-60286 lib: Update mustache to 2.12.0 2017-10-09 09:43:47 +08:00
Adrian Greeve
fb6e143ca3 MDL-60286 lib: Moodle changes to mustache upgrade 2017-10-09 09:43:47 +08:00
Adrian Greeve
35bbd8a3ae MDL-60284 lib: Update requirejs t0 2.3.5 2017-10-09 09:40:59 +08:00
Adrian Greeve
2e6daabc03 MDL-60284 lib: Update to Moodle requirejs file. 2017-10-09 09:40:59 +08:00
Adrian Greeve
ee9e92e594 MDL-60194 lib: Update to phpmailer 6.0.1 2017-10-09 09:30:00 +08:00
Adrian Greeve
56e62bbba1 MDL-60194 lib: Internal changes by Moodle to phpmailer. 2017-10-09 09:30:00 +08:00