Andrew Nicols [Mon, 29 Oct 2018 04:28:58 +0000 (12:28 +0800)]
Merge branch 'MDL-40695-master' of https://github.com/HuongNV13/moodle
Jun Pataleta [Mon, 29 Oct 2018 03:36:20 +0000 (11:36 +0800)]
Merge branch 'MDL-63622-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 29 Oct 2018 00:42:50 +0000 (08:42 +0800)]
Merge branch 'MDL-63665-master' of git://github.com/rezaies/moodle
Andrew Nicols [Mon, 29 Oct 2018 00:21:27 +0000 (08:21 +0800)]
Merge branch 'MDL-63680-master' of git://github.com/mihailges/moodle
Andrew Nicols [Sun, 28 Oct 2018 23:39:58 +0000 (07:39 +0800)]
Merge branch 'MDL-60520_master' of git://github.com/dmonllao/moodle
Adrian Greeve [Fri, 12 Oct 2018 05:18:55 +0000 (13:18 +0800)]
MDL-63622 core_grading: Add support for removal of context users.
Core grading now implements the new core_userlist_provider
interface to allow for deletion of specific users in a context.
Eloy Lafuente (stronk7) [Fri, 26 Oct 2018 16:06:00 +0000 (18:06 +0200)]
on-demand release 3.6dev+
Eloy Lafuente (stronk7) [Fri, 26 Oct 2018 16:05:58 +0000 (18:05 +0200)]
NOBUG: Fixed SVG browser compatibility
Eloy Lafuente (stronk7) [Fri, 26 Oct 2018 08:21:43 +0000 (10:21 +0200)]
Merge branch 'MDL-63765-master' of git://github.com/damyon/moodle
Damyon Wiese [Thu, 25 Oct 2018 08:59:50 +0000 (16:59 +0800)]
MDL-63765 behat: Fix behat tests opening a menu
If javascript is disabled, we don't need to open the menus at all. If it is enabled
we should use the custom step where possible.
In some tests (user profile) we have to use link_or_button because
the element that opens the menu will be a link or a button in different themes.
Shamim Rezaie [Wed, 17 Oct 2018 06:19:58 +0000 (17:19 +1100)]
MDL-63665 mod_choice: no exception when course_modules doesn't exist
This issue is a part of the MDL-62560 Epic.
Shamim Rezaie [Wed, 17 Oct 2018 06:17:00 +0000 (17:17 +1100)]
MDL-63665 mod_choice: support removal of multiple users in a context
This issue is a part of the MDL-62560 Epic.
Andrew Nicols [Fri, 26 Oct 2018 06:54:01 +0000 (14:54 +0800)]
Revert "MDL-63466 core_message: rename cache for last message time"
This reverts commit
f978593d6c3b98db5b3feb29448a642b4f540edc.
Andrew Nicols [Fri, 26 Oct 2018 06:53:58 +0000 (14:53 +0800)]
Revert "MDL-63466 core_message: removed get_last_message_time_created_cache_key"
This reverts commit
4f22d7f23b022c143910a9a136fecbd325dce356.
Andrew Nicols [Fri, 26 Oct 2018 04:33:13 +0000 (12:33 +0800)]
Merge branch 'MDL-63466-master' of https://github.com/snake/moodle
Jake Dallimore [Fri, 26 Oct 2018 04:26:23 +0000 (12:26 +0800)]
MDL-63466 core_message: don't reorder messages when formatting
- Removed the reordering code from helper::get_conversation_messages()
- Added unit test confirming sort param behaviour for the
api::get_conversations_messages() method.
Mihail Geshoski [Tue, 23 Oct 2018 07:18:03 +0000 (15:18 +0800)]
MDL-63680 report_stats: Add support for removal of context users
This issue is part of the MDL-62560 Epic.
Andrew Nicols [Fri, 26 Oct 2018 03:40:46 +0000 (11:40 +0800)]
Merge branch 'MDL-63673-master' of git://github.com/mihailges/moodle
Andrew Nicols [Fri, 26 Oct 2018 03:24:52 +0000 (11:24 +0800)]
Merge branch 'MDL-63281_master' of git://github.com/markn86/moodle
Andrew Nicols [Fri, 26 Oct 2018 03:06:44 +0000 (11:06 +0800)]
Merge branch 'MDL-60514-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 26 Oct 2018 02:47:04 +0000 (10:47 +0800)]
MDL-60514 tool_task: Remove run_task_now.feature
This test cannot be run on Behat anymore as the "Run now" feature
depends on $CFG->pathtophp. Even if it's set, the task executed via
"Run now" will be executed for the installed site itself and not on the
Behat test site.
Andrew Nicols [Fri, 26 Oct 2018 03:01:28 +0000 (11:01 +0800)]
Merge branch 'MDL-63682-master' of git://github.com/mihailges/moodle
cescobedo [Fri, 26 Oct 2018 02:30:52 +0000 (10:30 +0800)]
MDL-63281 core_message: Sync course group members with conversations
Mihail Geshoski [Tue, 23 Oct 2018 06:31:25 +0000 (14:31 +0800)]
MDL-63682 mnetservice_enrol: Add support for removal of context users
This issue is part of the MDL-62560 Epic.
Andrew Nicols [Fri, 26 Oct 2018 02:16:08 +0000 (10:16 +0800)]
Merge branch 'MDL-63688-master-1' of git://github.com/mihailges/moodle
Andrew Nicols [Fri, 26 Oct 2018 01:07:30 +0000 (09:07 +0800)]
Merge branch 'MDL-63280_master-fix' of git://github.com/markn86/moodle
Mark Nelson [Fri, 26 Oct 2018 00:52:27 +0000 (08:52 +0800)]
MDL-63280 core: correct index on upgrade vs install
Andrew Nicols [Thu, 25 Oct 2018 23:49:13 +0000 (07:49 +0800)]
Merge branch 'MDL-63280_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Thu, 25 Oct 2018 22:03:43 +0000 (00:03 +0200)]
Merge branch 'MDL-62904-master' of git://github.com/junpataleta/moodle
Juan Leyva [Wed, 17 Oct 2018 14:59:03 +0000 (16:59 +0200)]
MDL-63694 core_block: Return block contents via WS
Juan Leyva [Wed, 17 Oct 2018 14:20:52 +0000 (16:20 +0200)]
MDL-63694 block_html: Implement get_content_for_external
Juan Leyva [Wed, 17 Oct 2018 14:16:12 +0000 (16:16 +0200)]
MDL-63694 core_block: New block class method for external content
New method added block_base::get_content_for_external().
It will return all the block contents rendered for external functions.
If your block is returning formatted content or provide files for download,
you should override this method to use the external_format_text,
external_format_string functions for formatting or
external_util::get_area_files for files.
See block_html as example.
Eloy Lafuente (stronk7) [Thu, 25 Oct 2018 10:23:53 +0000 (12:23 +0200)]
Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle
Tim Hunt [Thu, 25 Oct 2018 10:08:04 +0000 (11:08 +0100)]
MDL-62411 qtype_ddmarkers: fix drop-zone editing in IE
Mark Nelson [Thu, 25 Oct 2018 04:10:29 +0000 (12:10 +0800)]
MDL-63280 core: removed 'message_conversation_area' table
These new fields have been added to the 'message_conversations'
table.
Mark Nelson [Wed, 24 Oct 2018 09:28:06 +0000 (17:28 +0800)]
MDL-63280 core_message: added constants for enabled/disabled
Mark Nelson [Tue, 23 Oct 2018 04:42:14 +0000 (12:42 +0800)]
MDL-63280 core: minor changes after review
- Fixed reference to non-existent column 'timeread'.
- Fixed alignment issues.
- Fixed inconsistencies between upgrade.php and install.xml.
- Cleaned unit tests of unnecessary DB calls.
- Renamed 'get_does_conversation_area_enabled' to
'is_conversation_area_enabled' and moved to api.php.
- Replaced "$mform->elementExists('enablemessaging')"
check with a capability check.
- Removed the change of [] to array() in unrelated to upgrade code.
- Updated conversation 'timemodified' field when updating name.
- Bumped version based on latest master.
Andrew Nicols [Thu, 25 Oct 2018 07:43:12 +0000 (15:43 +0800)]
Merge branch 'MDL-63552-master' of git://github.com/mickhawkins/moodle
Andrew Nicols [Thu, 25 Oct 2018 07:14:57 +0000 (15:14 +0800)]
Merge branch 'MDL-63752' of https://github.com/timhunt/moodle
Andrew Nicols [Thu, 25 Oct 2018 07:12:50 +0000 (15:12 +0800)]
Merge branch 'MDL-63679-master' of git://github.com/mihailges/moodle
Andrew Nicols [Thu, 25 Oct 2018 07:11:30 +0000 (15:11 +0800)]
Merge branch 'MDL-63678-master' of git://github.com/mihailges/moodle
Jun Pataleta [Thu, 25 Oct 2018 07:06:47 +0000 (15:06 +0800)]
Merge branch 'MDL-60514-master-new-cron-execution' of https://github.com/tonibarbera/moodle
Andrew Nicols [Thu, 25 Oct 2018 06:53:18 +0000 (14:53 +0800)]
Merge branch 'MDL-63655' of git://github.com/stronk7/moodle
Andrew Nicols [Thu, 25 Oct 2018 06:44:35 +0000 (14:44 +0800)]
MDL-63058 block_myoverview: Whitespace fixes
Andrew Nicols [Thu, 25 Oct 2018 06:32:52 +0000 (14:32 +0800)]
MDL-63058 block_myoverview: Whitespace fixes
Toni Barberà Melià [Tue, 18 Sep 2018 12:58:27 +0000 (14:58 +0200)]
MDL-60514 tasks: added new config parameter. changes in cron execution
cescobedo [Mon, 22 Oct 2018 20:40:40 +0000 (22:40 +0200)]
MDL-63280 core_message: Create group conversation from group edit page
Allows linking of course groups with conversations when group messaging feature is enabled.
cescobedo [Mon, 22 Oct 2018 20:34:15 +0000 (22:34 +0200)]
MDL-63280 core_message: Create conversation area
Andrew Nicols [Thu, 25 Oct 2018 03:49:45 +0000 (11:49 +0800)]
Merge branch 'MDL-63058-master' of git://github.com/bmbrands/moodle
Michael Hawkins [Mon, 15 Oct 2018 06:00:07 +0000 (14:00 +0800)]
MDL-63552 search_solr: Add support for removal of context users
This issue is a part of the MDL-62560 Epic.
Michael Hawkins [Fri, 5 Oct 2018 08:01:50 +0000 (16:01 +0800)]
MDL-63552 search_simpledb: Add support for removal of context users
This issue is a part of the MDL-62560 Epic.
Also added test_get_contexts_for_userid unit test.
Damyon Wiese [Thu, 25 Oct 2018 00:36:49 +0000 (08:36 +0800)]
Merge branch 'MDL-63755-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 24 Oct 2018 23:35:09 +0000 (01:35 +0200)]
Merge branch 'MDL-62145-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Wed, 24 Oct 2018 23:11:36 +0000 (01:11 +0200)]
Merge branch 'MDL-63153_master' of https://github.com/aanabit/moodle
Eloy Lafuente (stronk7) [Wed, 24 Oct 2018 22:10:45 +0000 (00:10 +0200)]
Merge branch 'MDL-63714-master' of git://github.com/andrewnicols/moodle
Bas Brands [Wed, 24 Oct 2018 13:02:19 +0000 (15:02 +0200)]
MDL-63058 block_myoverview: behat fixes and summary view check
Andrew Nicols [Wed, 24 Oct 2018 08:12:13 +0000 (16:12 +0800)]
MDL-63755 theme_boost: Behat selector fix
Tim Hunt [Wed, 24 Oct 2018 10:38:31 +0000 (11:38 +0100)]
MDL-63752 question import: duplicate key error when idnumbers blank
And extra checks to head off possible idnumber='' issues in two other places.
David Monllao [Wed, 24 Oct 2018 08:22:16 +0000 (10:22 +0200)]
Merge branch 'MDL-63277' of https://github.com/timhunt/moodle
David Monllao [Wed, 24 Oct 2018 07:48:16 +0000 (09:48 +0200)]
Merge branch 'MDL-63619-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 24 Oct 2018 00:39:38 +0000 (08:39 +0800)]
MDL-63714 javascript: Add new core/pending module
Andrew Nicols [Wed, 24 Oct 2018 04:44:47 +0000 (12:44 +0800)]
MDL-63714 theme_boost: Fix aria focus behat issues
Andrew Nicols [Wed, 24 Oct 2018 02:21:42 +0000 (10:21 +0800)]
Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle
Mark Nelson [Wed, 10 Oct 2018 10:38:23 +0000 (18:38 +0800)]
MDL-63466 core_message: deprecated methods and services
Mark Nelson [Fri, 12 Oct 2018 03:38:28 +0000 (11:38 +0800)]
MDL-63466 core_message: removed get_last_message_time_created_cache_key
Mark Nelson [Wed, 10 Oct 2018 09:12:24 +0000 (17:12 +0800)]
MDL-63466 core_message: rename cache for last message time
Sara Arjona [Tue, 23 Oct 2018 11:18:49 +0000 (13:18 +0200)]
MDL-63466 core_message: Add conversation support to get_messages
- The get_conversation_messages has been added to the API and the WS
with the conversation identifier (convid) instead of the userto,
to let get conversation messages and the members involved.
- The cache has been also reviewed, to use the convid instead of the
[userfrom, userto] keys.
- The get_most_recent_conversation_messages has been added to the API
to update the cache when needed.
Sara Arjona [Fri, 19 Oct 2018 11:23:17 +0000 (13:23 +0200)]
MDL-63466 core_message: Added format_conversation_messages helper
The format_conversation_messages function has been added. It returns
the messages and the array of users who have sent any of these
messages.
Sara Arjona [Fri, 19 Oct 2018 08:11:42 +0000 (10:11 +0200)]
MDL-63466 core_message: Add conversationid to message class
Mihail Geshoski [Wed, 24 Oct 2018 01:26:11 +0000 (09:26 +0800)]
MDL-63688 core_tag: Add method that returns users in context
This issue is part of the MDL-62560 Epic.
Jake Dallimore [Tue, 23 Oct 2018 08:51:00 +0000 (16:51 +0800)]
MDL-63466 core_message: added a test helper class
Providing util methods for api and externallib testing.
Jake Dallimore [Tue, 23 Oct 2018 03:30:39 +0000 (11:30 +0800)]
MDL-63466 core_message: add helper method for fetching member info
The aim is to use this to standardise the member information we return
from several methods in the API, such as get_conversations,
get_conversation_messages, get_conversation_members, and in search
methods.
Andrew Nicols [Mon, 22 Oct 2018 08:55:30 +0000 (16:55 +0800)]
MDL-63619 tool_dataprivacy: Cache purposes in form
Andrew Nicols [Wed, 17 Oct 2018 12:53:16 +0000 (20:53 +0800)]
MDL-63619 tool_dataprivacy: Performance improvement
Andrew Nicols [Mon, 15 Oct 2018 02:45:31 +0000 (10:45 +0800)]
MDL-63619 tool_dataprivacy: Fix inheritance from parent contexts
Inheritance should behave such that all contexts inherit from their
parent context.
Prior to this fix, if the value was not set on a context, then it was
getting a default of 'Inherit', but instead of inheritting from the
parent context, it was inheritting from its parent context _level_ which
is just wrong.
Andrew Nicols [Fri, 19 Oct 2018 07:13:37 +0000 (15:13 +0800)]
MDL-63714 core: Wrap doRender in pendingjs
Andrew Nicols [Tue, 23 Oct 2018 23:59:25 +0000 (07:59 +0800)]
MDL-63714 javascript: Improve docs for pendingjs
Mihail Geshoski [Wed, 17 Oct 2018 00:48:15 +0000 (08:48 +0800)]
MDL-63673 fileconverter_googledrive: Support removal of context users
This issue is part of the MDL-62560 Epic.
David Monllao [Tue, 23 Oct 2018 14:42:13 +0000 (16:42 +0200)]
on-demand release 3.6dev+
David Monllao [Tue, 23 Oct 2018 14:42:12 +0000 (16:42 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Tue, 23 Oct 2018 13:23:47 +0000 (21:23 +0800)]
Merge branch 'MDL-63408_master-fix' of git://github.com/dmonllao/moodle
David Monllao [Tue, 23 Oct 2018 11:44:52 +0000 (13:44 +0200)]
MDL-63408 messaging: Remove duplicated field
David Monllao [Tue, 23 Oct 2018 09:16:47 +0000 (11:16 +0200)]
Merge branch 'MDL-62139-master-fix3' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 23 Oct 2018 08:35:03 +0000 (16:35 +0800)]
MDL-62139 behat: Invalid test
If javascript is disabled, we can't open the menu.
Damyon Wiese [Tue, 23 Oct 2018 07:27:34 +0000 (15:27 +0800)]
MDL-62139 output: Revert template changes
Revert accessibility changes for menus in standard themes.
Damyon Wiese [Tue, 23 Oct 2018 07:27:34 +0000 (15:27 +0800)]
MDL-62139 output: Revert template changes
Revert accessibility changes for menus in standard themes.
Damyon Wiese [Tue, 23 Oct 2018 07:27:13 +0000 (15:27 +0800)]
MDL-62139 output: Menus fixes
Change the boost custom behat step to click on a button.
Revert the clean templates to unchanged versions.
Mihail Geshoski [Wed, 17 Oct 2018 01:12:09 +0000 (09:12 +0800)]
MDL-63679 ltiservice_memberships: Support for removal of context users
This issue is part of the MDL-62560 Epic.
Mihail Geshoski [Wed, 17 Oct 2018 00:56:59 +0000 (08:56 +0800)]
MDL-63678 ltiservice_gradebookservices: Support removal of context users
This issue is part of the MDL-62560 Epic.
Andrew Nicols [Tue, 23 Oct 2018 03:32:43 +0000 (11:32 +0800)]
MDL-63657 completion: Coding style fix
Andrew Nicols [Tue, 23 Oct 2018 03:29:29 +0000 (11:29 +0800)]
Merge branch 'MDL-63668-master' of git://github.com/mickhawkins/moodle
Andrew Nicols [Tue, 23 Oct 2018 03:26:02 +0000 (11:26 +0800)]
MDL-63657 core_files: Coding style fix
Andrew Nicols [Tue, 23 Oct 2018 03:25:21 +0000 (11:25 +0800)]
Merge branch 'MDL-63640-master' of git://github.com/mihailges/moodle
Andrew Nicols [Tue, 23 Oct 2018 03:21:51 +0000 (11:21 +0800)]
MDL-63657 tool_mobile: Coding style fix
Andrew Nicols [Tue, 23 Oct 2018 03:19:46 +0000 (11:19 +0800)]
Merge branch 'MDL-63657-master' of git://github.com/mickhawkins/moodle
Andrew Nicols [Tue, 23 Oct 2018 03:15:04 +0000 (11:15 +0800)]
MDL-63535 core_rss: Coding style fix
Andrew Nicols [Tue, 23 Oct 2018 03:11:22 +0000 (11:11 +0800)]
Merge branch 'MDL-63535-master' of git://github.com/mihailges/moodle
Andrew Nicols [Tue, 23 Oct 2018 02:53:57 +0000 (10:53 +0800)]
MDL-63664 tool_policy: Whitespace fix
Michael Hawkins [Mon, 15 Oct 2018 05:27:59 +0000 (13:27 +0800)]
MDL-63657 tool_mobile: Add support for removal of context users
This issue is a part of the MDL-62560 Epic.
Mihail Geshoski [Mon, 22 Oct 2018 00:42:42 +0000 (08:42 +0800)]
MDL-63640 core_files: Add method that returns users in context
This issue is part of the MDL-62560 Epic.