moodle.git
3 years agoMerge branch 'MDL-57455_master' of git://github.com/markn86/moodle
Jake Dallimore [Mon, 16 Oct 2017 02:34:01 +0000 (10:34 +0800)]
Merge branch 'MDL-57455_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-59988_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 16 Oct 2017 00:19:06 +0000 (08:19 +0800)]
Merge branch 'MDL-59988_master' of git://github.com/dmonllao/moodle

3 years agoMDL-59988 analytics: Process pending training and prediction files
David Monllao [Tue, 10 Oct 2017 07:45:21 +0000 (09:45 +0200)]
MDL-59988 analytics: Process pending training and prediction files

3 years agoMDL-59988 analytics: Files marked as used only if valid
David Monllao [Thu, 7 Sep 2017 12:42:17 +0000 (14:42 +0200)]
MDL-59988 analytics: Files marked as used only if valid

- Basic unit test for minimum machine learning backends requirements
- Warning return messages now include not enough data
- Clear models when the predictions processor is changed
- Refined the name of a couple of constants / methods

3 years agoweekly release 3.4dev
Jake Dallimore [Fri, 13 Oct 2017 06:33:08 +0000 (14:33 +0800)]
weekly release 3.4dev

3 years agoNOBUG: Fixed file access permissions
Jake Dallimore [Fri, 13 Oct 2017 06:33:08 +0000 (14:33 +0800)]
NOBUG: Fixed file access permissions

3 years agoNOBUG: Fixed SVG browser compatibility
Jake Dallimore [Fri, 13 Oct 2017 06:33:08 +0000 (14:33 +0800)]
NOBUG: Fixed SVG browser compatibility

3 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Jake Dallimore [Fri, 13 Oct 2017 06:33:07 +0000 (14:33 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

3 years agoMerge branch 'MDL-60357-master-fix' of https://github.com/andrewnicols/moodle
Jake Dallimore [Fri, 13 Oct 2017 03:40:05 +0000 (11:40 +0800)]
Merge branch 'MDL-60357-master-fix' of https://github.com/andrewnicols/moodle

3 years agoMDL-57455 mod_data: extended Behat test to cover searching names
Mark Nelson [Tue, 10 Oct 2017 10:02:20 +0000 (18:02 +0800)]
MDL-57455 mod_data: extended Behat test to cover searching names

Merged two Behat files that were doing similar things.

3 years agoMerge branch 'MDL-60029-master-fix' of git://github.com/junpataleta/moodle
Jake Dallimore [Fri, 13 Oct 2017 02:49:32 +0000 (10:49 +0800)]
Merge branch 'MDL-60029-master-fix' of git://github.com/junpataleta/moodle

3 years agoMDL-60029 profile: Replace table alias with non-reserve word
Jun Pataleta [Fri, 13 Oct 2017 02:38:00 +0000 (10:38 +0800)]
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.

3 years agoMDL-60357 search: Ensure that the document is valid
Andrew Nicols [Fri, 13 Oct 2017 01:41:57 +0000 (09:41 +0800)]
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.

3 years agoMerge branch 'MDL-60002-master' of https://github.com/snake/moodle
Damyon Wiese [Fri, 13 Oct 2017 01:20:18 +0000 (09:20 +0800)]
Merge branch 'MDL-60002-master' of https://github.com/snake/moodle

3 years agoMDL-60002 assign: Fixed validation on save and save and show next.
Jake Dallimore [Fri, 13 Oct 2017 01:04:08 +0000 (09:04 +0800)]
MDL-60002 assign: Fixed validation on save and save and show next.

3 years agoMerge branch 'MDL-60046-master' of https://github.com/snake/moodle
Andrew Nicols [Fri, 13 Oct 2017 00:32:57 +0000 (08:32 +0800)]
Merge branch 'MDL-60046-master' of https://github.com/snake/moodle

3 years agoMDL-60046 participants: Fix for groups behat feature.
Jake Dallimore [Fri, 13 Oct 2017 00:26:42 +0000 (08:26 +0800)]
MDL-60046 participants: Fix for groups behat feature.

3 years agoMerge branch 'MDL-60209-master-mathjaxlib' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Thu, 12 Oct 2017 20:51:59 +0000 (22:51 +0200)]
Merge branch 'MDL-60209-master-mathjaxlib' of git://github.com/mudrd8mz/moodle

3 years agoMDL-60209 mathjax: Do not load broken accessibility extensions
David Mudrák [Thu, 12 Oct 2017 13:03:36 +0000 (15:03 +0200)]
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.

3 years agoMDL-57455 mod_data: added 'Manage standard tags' link
Mark Nelson [Tue, 10 Oct 2017 10:01:27 +0000 (18:01 +0800)]
MDL-57455 mod_data: added 'Manage standard tags' link

3 years agoMDL-57455 mod_data: added reset tags functionality
Mark Nelson [Wed, 20 Sep 2017 08:45:38 +0000 (16:45 +0800)]
MDL-57455 mod_data: added reset tags functionality

3 years agoMDL-57455 mod_data: performance improvement for tags backup/restore
Mark Nelson [Mon, 2 Oct 2017 05:26:06 +0000 (13:26 +0800)]
MDL-57455 mod_data: performance improvement for tags backup/restore

3 years agoMDL-57455 mod_data: allow tags to be removed from search criteria
Mark Nelson [Thu, 12 Oct 2017 05:46:33 +0000 (13:46 +0800)]
MDL-57455 mod_data: allow tags to be removed from search criteria

3 years agoMDL-57455 mod_data: added missing accessibility check
Mark Nelson [Thu, 21 Sep 2017 06:44:46 +0000 (14:44 +0800)]
MDL-57455 mod_data: added missing accessibility check

3 years agoMDL-57455 mod_data: Added PHPUnit tests
Andrew Hancox [Thu, 14 Sep 2017 10:17:05 +0000 (18:17 +0800)]
MDL-57455 mod_data: Added PHPUnit tests

3 years agoMDL-57455 mod_data: Added Behat tests to cover tagging
Andrew Hancox [Thu, 24 Aug 2017 21:31:19 +0000 (00:31 +0300)]
MDL-57455 mod_data: Added Behat tests to cover tagging

3 years agoMDL-57455 mod_data: Import and export tags
Andrew Hancox [Mon, 31 Jul 2017 10:09:08 +0000 (11:09 +0100)]
MDL-57455 mod_data: Import and export tags

3 years agoMDL-57455 mod_data: Extend advanced search to cover tags
Andrew Hancox [Mon, 31 Jul 2017 07:45:11 +0000 (08:45 +0100)]
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.

3 years agoMDL-57455 mod_data: Implement tagging
Andrew Hancox [Thu, 14 Sep 2017 08:57:00 +0000 (16:57 +0800)]
MDL-57455 mod_data: Implement tagging

3 years agoMerge branch 'wip-MDL-60029-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Thu, 12 Oct 2017 08:16:42 +0000 (16:16 +0800)]
Merge branch 'wip-MDL-60029-master' of git://github.com/marinaglancy/moodle

3 years agoMerge branch 'MDL-55356-master-fix' of git://github.com/junpataleta/moodle
Andrew Nicols [Thu, 12 Oct 2017 07:49:25 +0000 (15:49 +0800)]
Merge branch 'MDL-55356-master-fix' of git://github.com/junpataleta/moodle

3 years agoMDL-55356 search: Remove unnecessary var_dump call
Jun Pataleta [Thu, 12 Oct 2017 07:45:46 +0000 (15:45 +0800)]
MDL-55356 search: Remove unnecessary var_dump call

3 years agoMerge branch 'MDL-55356-master-fix' of https://github.com/andrewnicols/moodle
Jake Dallimore [Thu, 12 Oct 2017 07:00:11 +0000 (15:00 +0800)]
Merge branch 'MDL-55356-master-fix' of https://github.com/andrewnicols/moodle

3 years agoMDL-55356 backup: Correct variable name
Andrew Nicols [Thu, 12 Oct 2017 06:53:16 +0000 (14:53 +0800)]
MDL-55356 backup: Correct variable name

3 years agoMerge branch 'MDL-60288-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Thu, 12 Oct 2017 06:48:59 +0000 (14:48 +0800)]
Merge branch 'MDL-60288-master' of git://github.com/ankitagarwal/moodle

3 years agoMerge branch 'wip-MDL-60195-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Thu, 12 Oct 2017 06:34:05 +0000 (14:34 +0800)]
Merge branch 'wip-MDL-60195-master' of git://github.com/abgreeve/moodle

3 years agoMerge branch 'MDL-60092-master-fix2' of git://github.com/lameze/moodle
Damyon Wiese [Thu, 12 Oct 2017 06:31:17 +0000 (14:31 +0800)]
Merge branch 'MDL-60092-master-fix2' of git://github.com/lameze/moodle

3 years agoMDL-60288 libraries: Upgrade spout to 2.7.3
Ankit Agarwal [Thu, 5 Oct 2017 19:31:17 +0000 (01:01 +0530)]
MDL-60288 libraries: Upgrade spout to 2.7.3

3 years agoMDL-60268 tool_usertours: Switch to Template.append
Andrew Nicols [Thu, 12 Oct 2017 05:54:09 +0000 (13:54 +0800)]
MDL-60268 tool_usertours: Switch to Template.append

3 years agoMerge branch 'wip-MDL-60268-master' of https://github.com/Beedell/moodle
Andrew Nicols [Thu, 12 Oct 2017 05:44:16 +0000 (13:44 +0800)]
Merge branch 'wip-MDL-60268-master' of https://github.com/Beedell/moodle

3 years agoMDL-60092 calendar: fix no events message message logic
Simey Lameze [Thu, 12 Oct 2017 05:39:35 +0000 (13:39 +0800)]
MDL-60092 calendar: fix no events message message logic

3 years agoMDL-59106 analytics: whitespace fixes
Jake Dallimore [Thu, 12 Oct 2017 04:31:56 +0000 (12:31 +0800)]
MDL-59106 analytics: whitespace fixes

3 years agoMerge branch 'MDL-59854-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Thu, 12 Oct 2017 04:27:34 +0000 (12:27 +0800)]
Merge branch 'MDL-59854-master' of git://github.com/junpataleta/moodle

3 years agoMDL-59854 forum: Created unique db key for forum_subscriptions
Tobias Reischmann [Thu, 17 Aug 2017 15:01:22 +0000 (17:01 +0200)]
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.

3 years agoMDL-55356 search: Merge conflict fix
Andrew Nicols [Thu, 12 Oct 2017 03:54:04 +0000 (11:54 +0800)]
MDL-55356 search: Merge conflict fix

3 years agoMDL-55356 search: Insert non-empty default data in block fixture data
Andrew Nicols [Thu, 12 Oct 2017 03:53:06 +0000 (11:53 +0800)]
MDL-55356 search: Insert non-empty default data in block fixture data

3 years agoMDL-55356 backup: Check setting exists before checking value
Andrew Nicols [Thu, 12 Oct 2017 03:28:40 +0000 (11:28 +0800)]
MDL-55356 backup: Check setting exists before checking value

3 years agoMerge branch 'MDL-55356-master' of https://github.com/sammarshallou/moodle
Andrew Nicols [Thu, 12 Oct 2017 03:28:04 +0000 (11:28 +0800)]
Merge branch 'MDL-55356-master' of https://github.com/sammarshallou/moodle

3 years agoMerge branch 'MDL-59106_master-fix2' of git://github.com/dmonllao/moodle
Jake Dallimore [Thu, 12 Oct 2017 02:54:47 +0000 (10:54 +0800)]
Merge branch 'MDL-59106_master-fix2' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-59106_master-fix' of git://github.com/dmonllao/moodle
Jake Dallimore [Thu, 12 Oct 2017 02:54:25 +0000 (10:54 +0800)]
Merge branch 'MDL-59106_master-fix' of git://github.com/dmonllao/moodle

3 years agoMerge branch 'MDL-59106_master' of git://github.com/markn86/moodle
Jake Dallimore [Thu, 12 Oct 2017 02:53:20 +0000 (10:53 +0800)]
Merge branch 'MDL-59106_master' of git://github.com/markn86/moodle

3 years agoMerge branch 'MDL-59921-master-fix2' of git://github.com/lameze/moodle
Jun Pataleta [Thu, 12 Oct 2017 01:49:49 +0000 (09:49 +0800)]
Merge branch 'MDL-59921-master-fix2' of git://github.com/lameze/moodle

3 years agoMDL-59921 calendar: remove disabledIf from group select
Simey Lameze [Thu, 12 Oct 2017 01:19:43 +0000 (09:19 +0800)]
MDL-59921 calendar: remove disabledIf from group select

3 years agoMerge branch 'MDL-60209-master-mathjaxlib' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 11 Oct 2017 23:52:47 +0000 (01:52 +0200)]
Merge branch 'MDL-60209-master-mathjaxlib' of git://github.com/mudrd8mz/moodle

3 years agoMDL-60291 libraries: bump readme to actual versions
Eloy Lafuente (stronk7) [Wed, 11 Oct 2017 22:47:22 +0000 (00:47 +0200)]
MDL-60291 libraries: bump readme to actual versions

3 years agoMerge branch 'MDL-60291-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 11 Oct 2017 22:42:57 +0000 (00:42 +0200)]
Merge branch 'MDL-60291-master' of git://github.com/ankitagarwal/moodle

3 years agoMerge branch 'MDL-60301-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Wed, 11 Oct 2017 22:37:11 +0000 (00:37 +0200)]
Merge branch 'MDL-60301-master' of git://github.com/ankitagarwal/moodle

3 years agoMerge branch 'MDL-60302-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 11 Oct 2017 19:14:54 +0000 (21:14 +0200)]
Merge branch 'MDL-60302-master' of git://github.com/jleyva/moodle

3 years agoMerge branch 'MDL-60357-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 11 Oct 2017 18:49:01 +0000 (20:49 +0200)]
Merge branch 'MDL-60357-master' of https://github.com/sammarshallou/moodle

3 years agoMDL-55356 core_search: Make indexing task/CLI do context requests
sam marshall [Fri, 15 Sep 2017 13:08:09 +0000 (14:08 +0100)]
MDL-55356 core_search: Make indexing task/CLI do context requests

3 years agoMDL-55356 core_search: New manager API index_context
sam marshall [Mon, 11 Sep 2017 16:30:10 +0000 (17:30 +0100)]
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.

3 years agoMDL-55356 core_search: Change existing search areas to new API
sam marshall [Mon, 11 Sep 2017 10:29:26 +0000 (11:29 +0100)]
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

3 years agoMDL-55356 core_message: Rename unit tests with wrong names
sam marshall [Mon, 11 Sep 2017 12:25:11 +0000 (13:25 +0100)]
MDL-55356 core_message: Rename unit tests with wrong names

3 years agoMDL-55356 core_search: New area API get_document_recordset
sam marshall [Wed, 6 Sep 2017 14:37:14 +0000 (15:37 +0100)]
MDL-55356 core_search: New area API get_document_recordset

The search area API now includes a new function get_document_recordset
which should be implemented in preference to the older
get_recordset_by_timestamp. (It's also possible to implement both in
plugin search areas which need to work against older Moodle versions.)

Existing search areas without the new function will continue to work as
before (obviously without the new functionality).

3 years agoMDL-55356 core_search: Restore now requests search indexing
sam marshall [Thu, 7 Sep 2017 11:00:50 +0000 (12:00 +0100)]
MDL-55356 core_search: Restore now requests search indexing

When restoring into a new course, it will queue a request to index
the whole course; when adding to existing, it will queue a request
to index the specific (a) activities and (b) blocks that were
restored.

3 years agoMDL-55356 core_search: API to queue contexts for indexing
sam marshall [Thu, 7 Sep 2017 15:38:38 +0000 (16:38 +0100)]
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.

3 years agoMDL-55356 core_search: API to check if indexing enabled
sam marshall [Thu, 7 Sep 2017 09:46:58 +0000 (10:46 +0100)]
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.

3 years agoMDL-55356 core_search: Make base_block handle empty restored blocks
sam marshall [Fri, 15 Sep 2017 14:55:20 +0000 (15:55 +0100)]
MDL-55356 core_search: Make base_block handle empty restored blocks

3 years agoMDL-59921 core_calendar: remove unnecessary behat step
Simey Lameze [Wed, 11 Oct 2017 08:37:46 +0000 (16:37 +0800)]
MDL-59921 core_calendar: remove unnecessary behat step

3 years agoMDL-59921 calendar: fix wrong array assumptions
Simey Lameze [Wed, 11 Oct 2017 08:22:06 +0000 (16:22 +0800)]
MDL-59921 calendar: fix wrong array assumptions

3 years agoMerge branch 'MDL-60090-master' of git://github.com/andrewnicols/moodle
Jun Pataleta [Wed, 11 Oct 2017 07:58:46 +0000 (15:58 +0800)]
Merge branch 'MDL-60090-master' of git://github.com/andrewnicols/moodle

3 years agoMDL-60090 calendar: Add eventtype icon and truncate
Andrew Nicols [Tue, 12 Sep 2017 01:45:59 +0000 (09:45 +0800)]
MDL-60090 calendar: Add eventtype icon and truncate

3 years agoMerge branch 'MDL-60092-master' of git://github.com/lameze/moodle
Damyon Wiese [Wed, 11 Oct 2017 06:02:52 +0000 (14:02 +0800)]
Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle

3 years agoMDL-60092 calendar: add missing upcoming view logic
Simey Lameze [Wed, 11 Oct 2017 03:42:41 +0000 (11:42 +0800)]
MDL-60092 calendar: add missing upcoming view logic

3 years agoMerge branch 'MDL-59921-master' of git://github.com/lameze/moodle
Jun Pataleta [Wed, 11 Oct 2017 03:07:14 +0000 (11:07 +0800)]
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle

3 years agoMDL-59921 calendar: fix missing course error on event form
Simey Lameze [Wed, 11 Oct 2017 01:37:30 +0000 (09:37 +0800)]
MDL-59921 calendar: fix missing course error on event form

3 years agoMerge branch 'master_MDL-60276' of https://github.com/CengageEng/moodle
Andrew Nicols [Wed, 11 Oct 2017 01:38:47 +0000 (09:38 +0800)]
Merge branch 'master_MDL-60276' of https://github.com/CengageEng/moodle

3 years agoMerge branch 'MDL-60300' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 23:39:55 +0000 (01:39 +0200)]
Merge branch 'MDL-60300' of https://github.com/NeillM/moodle

3 years agoMerge branch 'MDL-60309-master-boostbackground' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 23:34:17 +0000 (01:34 +0200)]
Merge branch 'MDL-60309-master-boostbackground' of git://github.com/mudrd8mz/moodle

3 years agoMerge branch 'MDL-60346-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 23:03:06 +0000 (01:03 +0200)]
Merge branch 'MDL-60346-master' of https://github.com/sammarshallou/moodle

3 years agoMerge branch 'MDL-60364' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 23:00:13 +0000 (01:00 +0200)]
Merge branch 'MDL-60364' of https://github.com/NeillM/moodle

3 years agoMerge branch 'MDL-55358-master' of https://github.com/davidknu/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 22:00:10 +0000 (00:00 +0200)]
Merge branch 'MDL-55358-master' of https://github.com/davidknu/moodle

3 years agoMerge branch 'MDL-60002-save-and-show-next' of https://github.com/abalbanyan/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 18:14:42 +0000 (20:14 +0200)]
Merge branch 'MDL-60002-save-and-show-next' of https://github.com/abalbanyan/moodle

3 years agoMerge branch 'MDL-60046-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 10 Oct 2017 17:10:52 +0000 (19:10 +0200)]
Merge branch 'MDL-60046-master' of git://github.com/damyon/moodle

3 years agoMDL-60396 mod_workshop: Add checks for maximum gradeover
Juan Leyva [Wed, 4 Oct 2017 19:01:50 +0000 (21:01 +0200)]
MDL-60396 mod_workshop: Add checks for maximum gradeover

3 years agoMDL-59106 report_insights: Order prediction values
David Monllao [Tue, 10 Oct 2017 10:49:24 +0000 (12:49 +0200)]
MDL-59106 report_insights: Order prediction values

3 years agoMDL-59106 report_insights: Fix predicted value styling
David Monllao [Tue, 10 Oct 2017 10:33:26 +0000 (12:33 +0200)]
MDL-59106 report_insights: Fix predicted value styling

3 years agoMerge branch 'MDL-37361-master-revised' of https://github.com/snake/moodle
Damyon Wiese [Tue, 10 Oct 2017 09:32:47 +0000 (17:32 +0800)]
Merge branch 'MDL-37361-master-revised' of https://github.com/snake/moodle

Conflicts:
lib/db/upgrade.php
version.php

3 years agoMerge branch 'MDL-60092-master' of git://github.com/lameze/moodle
Damyon Wiese [Tue, 10 Oct 2017 09:17:56 +0000 (17:17 +0800)]
Merge branch 'MDL-60092-master' of git://github.com/lameze/moodle

3 years agoMDL-37361 completion: Consolidate icon logic and clarify web service
Jake Dallimore [Fri, 29 Sep 2017 01:43:43 +0000 (09:43 +0800)]
MDL-37361 completion: Consolidate icon logic and clarify web service

- Icon generation logic moved to the course renderer.
- Web service should return the completion info only, not HTML.
- JS modified to handle icon rendering in relevant cases.

3 years agoMDL-37361 completion: minor code fixes.
Jake Dallimore [Mon, 4 Sep 2017 05:54:14 +0000 (13:54 +0800)]
MDL-37361 completion: minor code fixes.

3 years agoMDL-37361 completion: accessibility fixes for completion overrides
Jake Dallimore [Fri, 2 Jun 2017 07:03:48 +0000 (15:03 +0800)]
MDL-37361 completion: accessibility fixes for completion overrides

- Fixed aria-roles for links acting as status override buttons
- Used custom_interaction_events for better activation handling
- Replaced core/notification with AMD modal which facilitates better
onhide focus control when cancelling or confirming the action.

3 years agoMDL-37361 behat: added a test covering the activity completion report
Jake Dallimore [Fri, 7 Apr 2017 08:21:55 +0000 (16:21 +0800)]
MDL-37361 behat: added a test covering the activity completion report

3 years agoMDL-37361 completion: make completion overrides visible to students
Jake Dallimore [Mon, 3 Apr 2017 02:08:10 +0000 (10:08 +0800)]
MDL-37361 completion: make completion overrides visible to students

- Set icons in the course/renderer
- Use 'set' in lang strings for simplicity
- Code style fixes

3 years agoMDL-37361 completion: automatic completion disabled when overridden
Jake Dallimore [Mon, 3 Apr 2017 05:47:50 +0000 (13:47 +0800)]
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

3 years agoMDL-37361 completion: Modified and Added phpunit tests
Eiz Eddin Al Katrib [Fri, 17 Feb 2017 14:48:25 +0000 (14:48 +0000)]
MDL-37361 completion: Modified and Added phpunit tests

3 years agoMDL-37361 completion: Enabled overriding activity completion status
Eiz Eddin Al Katrib [Fri, 17 Feb 2017 14:48:02 +0000 (14:48 +0000)]
MDL-37361 completion: Enabled overriding activity completion status

3 years agoMerge branch 'MDL-59921-master' of git://github.com/lameze/moodle
Jun Pataleta [Tue, 10 Oct 2017 08:19:36 +0000 (16:19 +0800)]
Merge branch 'MDL-59921-master' of git://github.com/lameze/moodle

3 years agoMDL-59921 core_calendar: fix phpunit failures on event form
Simey Lameze [Tue, 10 Oct 2017 07:50:46 +0000 (15:50 +0800)]
MDL-59921 core_calendar: fix phpunit failures on event form

3 years agoMerge branch 'wip-MDL-58546-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Tue, 10 Oct 2017 07:26:38 +0000 (15:26 +0800)]
Merge branch 'wip-MDL-58546-master' of git://github.com/marinaglancy/moodle