86679 Commits

Author SHA1 Message Date
Damyon Wiese
14de134454 Merge branch 'MDL-60002-master' of https://github.com/snake/moodle 2017-10-13 09:20:18 +08:00
Jake Dallimore
41be91c00b MDL-60002 assign: Fixed validation on save and save and show next. 2017-10-13 09:04:08 +08:00
Andrew Nicols
122b8aa73b Merge branch 'MDL-60046-master' of https://github.com/snake/moodle 2017-10-13 08:32:57 +08:00
Jake Dallimore
eae71c8553 MDL-60046 participants: Fix for groups behat feature. 2017-10-13 08:26:42 +08:00
Eloy Lafuente (stronk7)
f088e261f7 Merge branch 'MDL-60209-master-mathjaxlib' of git://github.com/mudrd8mz/moodle 2017-10-12 22:51:59 +02:00
David Mudrák
9e6df843a0 MDL-60209 mathjax: Do not load broken accessibility extensions
The Accessible.js config loads accessibility-menu extension which in
turn loads mathjax-sre.js library. There is a bug in this library
https://github.com/zorkow/speech-rule-engine/issues/182 that makes it
fail in RequireJS environments. This has been reported upstream as
https://github.com/mathjax/MathJax/issues/1854

As an immediate solution for now, this patch changes the default MathJax
configuration so that it does not load accessibility extensions at all.
2017-10-12 22:11:45 +02:00
Juan Leyva
66a159f8db MDL-60365 tool_mobile: Extra configuration checks 2017-10-12 11:46:18 +02:00
Mark Nelson
822b3346ce MDL-57455 mod_data: added 'Manage standard tags' link 2017-10-12 16:59:16 +08:00
Mark Nelson
80effa0faa MDL-57455 mod_data: added reset tags functionality 2017-10-12 16:59:16 +08:00
Mark Nelson
5623d18784 MDL-57455 mod_data: performance improvement for tags backup/restore 2017-10-12 16:59:16 +08:00
Mark Nelson
a783cf701c MDL-57455 mod_data: allow tags to be removed from search criteria 2017-10-12 16:59:16 +08:00
Mark Nelson
f7a12344cb MDL-57455 mod_data: added missing accessibility check 2017-10-12 16:59:15 +08:00
Andrew Hancox
ee9a2706b3 MDL-57455 mod_data: Added PHPUnit tests 2017-10-12 16:59:15 +08:00
Andrew Hancox
f4c5328c2b MDL-57455 mod_data: Added Behat tests to cover tagging 2017-10-12 16:59:15 +08:00
Andrew Hancox
04f7b079bc MDL-57455 mod_data: Import and export tags 2017-10-12 16:59:15 +08:00
Andrew Hancox
d45c7a6823 MDL-57455 mod_data: Extend advanced search to cover tags
Also removed redundant code as $advtables, $advwhere etc.
are only used below when constructing $fromsql which is
only used if advanced is empty.
2017-10-12 16:59:15 +08:00
Andrew Hancox
ca5f3e0a2e MDL-57455 mod_data: Implement tagging 2017-10-12 16:59:14 +08:00
Jun Pataleta
dab702d394 Merge branch 'wip-MDL-60029-master' of git://github.com/marinaglancy/moodle 2017-10-12 16:16:42 +08:00
Andrew Nicols
42c7270eb1 Merge branch 'MDL-55356-master-fix' of git://github.com/junpataleta/moodle 2017-10-12 15:49:25 +08:00
Jun Pataleta
098f37c942 MDL-55356 search: Remove unnecessary var_dump call 2017-10-12 15:45:52 +08:00
Jake Dallimore
131e60741a Merge branch 'MDL-55356-master-fix' of https://github.com/andrewnicols/moodle 2017-10-12 15:00:11 +08:00
Andrew Nicols
77b2662ffb MDL-55356 backup: Correct variable name 2017-10-12 14:53:16 +08:00
Andrew Nicols
f3a4164dac Merge branch 'MDL-60288-master' of git://github.com/ankitagarwal/moodle 2017-10-12 14:48:59 +08:00
Andrew Nicols
6fa6e63129 Merge branch 'wip-MDL-60195-master' of git://github.com/abgreeve/moodle 2017-10-12 14:34:05 +08:00
Damyon Wiese
2962f0fa51 Merge branch 'MDL-60092-master-fix2' of git://github.com/lameze/moodle 2017-10-12 14:31:17 +08:00
Ankit Agarwal
de6ad82f2c MDL-60288 libraries: Upgrade spout to 2.7.3 2017-10-12 11:32:15 +05:30
Andrew Nicols
da419adfb0 MDL-60268 tool_usertours: Switch to Template.append 2017-10-12 13:54:09 +08:00
Andrew Nicols
19c0da47e0 Merge branch 'wip-MDL-60268-master' of https://github.com/Beedell/moodle 2017-10-12 13:44:16 +08:00
Simey Lameze
9adc10955e MDL-60092 calendar: fix no events message message logic 2017-10-12 13:39:35 +08:00
Jake Dallimore
7f1b75ba04 MDL-59106 analytics: whitespace fixes 2017-10-12 12:31:56 +08:00
Jun Pataleta
458d9e084f Merge branch 'MDL-59854-master' of git://github.com/junpataleta/moodle 2017-10-12 12:27:34 +08:00
Tobias Reischmann
05f9380cbc MDL-59854 forum: Created unique db key for forum_subscriptions
Due to race conditions in the function subscribe_user
it was possible to create duplicate forum subscriptions.
This lead to error messages, when displaying the list of
all subscriptions.
This patch removes all existing duplicate entries and
creates a unique db key to prevent this from happening in
the future.
2017-10-12 12:24:03 +08:00
Andrew Nicols
c1c6ed1b67 MDL-55356 search: Merge conflict fix 2017-10-12 11:54:04 +08:00
Andrew Nicols
ed15e64a3d MDL-55356 search: Insert non-empty default data in block fixture data 2017-10-12 11:53:06 +08:00
Andrew Nicols
afc8d59c35 MDL-55356 backup: Check setting exists before checking value 2017-10-12 11:37:05 +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
c36907bf5a Merge branch 'MDL-59106_master-fix2' of git://github.com/dmonllao/moodle 2017-10-12 10:54:47 +08:00
Jake Dallimore
cb9a803d80 Merge branch 'MDL-59106_master-fix' of git://github.com/dmonllao/moodle 2017-10-12 10:54:25 +08:00
Jake Dallimore
0ce9026307 Merge branch 'MDL-59106_master' of git://github.com/markn86/moodle 2017-10-12 10:53:20 +08:00
Jun Pataleta
5bc84e9f17 Merge branch 'MDL-59921-master-fix2' of git://github.com/lameze/moodle 2017-10-12 09:49:49 +08:00
Simey Lameze
2ab3787e18 MDL-59921 calendar: remove disabledIf from group select 2017-10-12 09:19:43 +08:00
Eloy Lafuente (stronk7)
b43a99ad92 Merge branch 'MDL-60209-master-mathjaxlib' of git://github.com/mudrd8mz/moodle 2017-10-12 01:52:47 +02: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
Eloy Lafuente (stronk7)
ae2ae5f46f Merge branch 'MDL-60301-master' of git://github.com/ankitagarwal/moodle 2017-10-12 00:37:11 +02:00
Eloy Lafuente (stronk7)
a9d3910d70 Merge branch 'MDL-60302-master' of git://github.com/jleyva/moodle 2017-10-11 21:14:54 +02:00
Eloy Lafuente (stronk7)
e9802809f4 Merge branch 'MDL-60357-master' of https://github.com/sammarshallou/moodle 2017-10-11 20:49:01 +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
4ba11aa907 MDL-55356 core_search: New manager API index_context
New function which uses the get_document_recordset function in
search areas to support full and partial indexing of a given
context.
2017-10-11 17:17:10 +01:00
sam marshall
66e3702680 MDL-55356 core_search: Change existing search areas to new API
This change considers all existing search areas in Moodle and makes
necessary changes.

Custom change to course search, supported by helper in base.php:

* course/classes/search/mycourse.php

Custom change to message search:

* message/classes/search/message_received.php
* message/classes/search/message_sent.php

Custom change to user search:

* user/classes/search/user.php

Custom changes to module areas, supported by helper in base_mod.php:

* mod/book/classes/search/chapter.php
* mod/data/classes/search/entry.php
* mod/forum/classes/search/post.php
* mod/glossary/classes/search/entry.php
* mod/survey/classes/search/activity.php
* mod/wiki/classes/search/collaborative_page.php

(Note: the unit tests do not exhaustively check every context type
for these, given that's mainly handled by the helper function
which was already tested in the base_activity test.)

Handled by block base class (no change):

* blocks/html/classes/search/content.php

Handled by activity base class (no change):

* mod/assign/classes/search/activity.php
* mod/book/classes/search/activity.php
* mod/chat/classes/search/activity.php
* mod/choice/classes/search/activity.php
* mod/data/classes/search/activity.php
* mod/feedback/classes/search/activity.php
* mod/folder/classes/search/activity.php
* mod/forum/classes/search/activity.php
* mod/glossary/classes/search/activity.php
* mod/imscp/classes/search/activity.php
* mod/label/classes/search/activity.php
* mod/lesson/classes/search/activity.php
* mod/lti/classes/search/activity.php
* mod/page/classes/search/activity.php
* mod/quiz/classes/search/activity.php
* mod/resource/classes/search/activity.php
* mod/scorm/classes/search/activity.php
* mod/url/classes/search/activity.php
* mod/wiki/classes/search/activity.php
* mod/workshop/classes/search/activity.php
2017-10-11 17:17:09 +01:00