Commit Graph

89847 Commits

Author SHA1 Message Date
Andrew Nicols 028fa14436 MDL-60058 assign: Updating gradingduedate on drag/drop 2017-10-13 06:38:02 +00:00
Ryan Wyllie a4f949442c MDL-60058 calendar: fix event context issue in month_detailed 2017-10-13 06:38:02 +00:00
Ryan Wyllie 8c4b939cfe MDL-60058 choice: implement timestart range callback for calendar UI 2017-10-13 06:38:02 +00:00
Jake Dallimore 9a316f3367 weekly release 3.4dev 2017-10-13 14:33:08 +08:00
Jake Dallimore 20b5ea16b7 NOBUG: Fixed file access permissions 2017-10-13 14:33:08 +08:00
Jake Dallimore 6e74f41b41 NOBUG: Fixed SVG browser compatibility 2017-10-13 14:33:08 +08:00
Jake Dallimore 5bcd7317d1 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-10-13 14:33:07 +08:00
Ryan Wyllie c56dd950eb MDL-60058 calendar: add visual indicator to UI for valid drop zones 2017-10-13 06:18:44 +00:00
Ryan Wyllie f4c2156189 MDL-60058 assign: allow update of assign calendar action events 2017-10-13 06:18:43 +00:00
Marina Glancy 402a8e7a7a MDL-58915 search_solr: connection to solr can use blocked hosts 2017-10-13 12:17:32 +08:00
Jake Dallimore 1799dd9e0c Merge branch 'MDL-60357-master-fix' of https://github.com/andrewnicols/moodle 2017-10-13 11:40:05 +08:00
Mark Nelson 0f09368cbb MDL-57455 mod_data: extended Behat test to cover searching names
Merged two Behat files that were doing similar things.
2017-10-13 11:01:42 +08:00
Jake Dallimore 2fe80946bc Merge branch 'MDL-60029-master-fix' of git://github.com/junpataleta/moodle 2017-10-13 10:49:32 +08:00
Jun Pataleta 5a3f03b2a8 MDL-60029 profile: Replace table alias with non-reserve word
* The table alias 'uid' is a reserved word in oracle. Replaced it with
something a little more safe.
2017-10-13 10:38:00 +08:00
Andrew Nicols 0049244893 MDL-60357 search: Ensure that the document is valid
We were previously testing tha the parent is valid, which it was, and
then fetching the current record, before fetching data from it.

However, the way in which the recordset walk works, the valid function
checks whether the _record_ itself is valid, whilst the current allows
for a callback to be applied.

In this instance, the data-entry was failing because the count of
indexfields was < 2. The recordset data itself was valid, but the view
was not, and as a result, the current() function returned false.

This false was not previously handled.

I've changed the logic so that we handle this case, and have removed a
double-negative in the process.
2017-10-13 09:41:59 +08:00
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