Commit graph

92464 commits

Author SHA1 Message Date
Toni Barberà Melià
c759ae5d55 MDL-60514 tasks: added new config parameter. changes in cron execution 2018-10-25 08:02:44 +02:00
cescobedo
e7f467143f MDL-63280 core_message: Create group conversation from group edit page
Allows linking of course groups with conversations when group messaging feature is enabled.
2018-10-25 12:20:00 +08:00
cescobedo
55fda006e3 MDL-63280 core_message: Create conversation area 2018-10-25 12:20:00 +08:00
Andrew Nicols
2263bbdfce Merge branch 'MDL-63058-master' of git://github.com/bmbrands/moodle 2018-10-25 11:49:45 +08:00
Michael Hawkins
fc087fd29e MDL-63552 search_solr: Add support for removal of context users
This issue is a part of the MDL-62560 Epic.
2018-10-25 11:41:08 +08:00
Michael Hawkins
4cef924482 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.
2018-10-25 11:41:08 +08:00
Nick Phillips
2070142f46 MDL-63763 javascript: don't have define( in AMD comments at top of files 2018-10-25 16:21:35 +13:00
Damyon Wiese
1524c4d66c Merge branch 'MDL-63755-master' of git://github.com/andrewnicols/moodle 2018-10-25 08:36:49 +08:00
Eloy Lafuente (stronk7)
980ed5424d Merge branch 'MDL-62145-master' of git://github.com/damyon/moodle 2018-10-25 01:35:09 +02:00
Eloy Lafuente (stronk7)
3d18697115 Merge branch 'MDL-63153_master' of https://github.com/aanabit/moodle 2018-10-25 01:11:36 +02:00
Eloy Lafuente (stronk7)
19dbce00a1 Merge branch 'MDL-63714-master' of git://github.com/andrewnicols/moodle 2018-10-25 00:10:45 +02:00
Bas Brands
099049b6ad MDL-63058 block_myoverview: behat fixes and summary view check 2018-10-24 15:02:19 +02:00
Andrew Nicols
c7120f7805 MDL-63755 theme_boost: Behat selector fix 2018-10-24 20:16:22 +08:00
Tim Hunt
2d696f8f2b MDL-63752 question import: duplicate key error when idnumbers blank
And extra checks to head off possible idnumber='' issues in two other places.
2018-10-24 11:38:31 +01:00
David Monllao
fcc50ccbc3 Merge branch 'MDL-63277' of https://github.com/timhunt/moodle 2018-10-24 10:22:16 +02:00
David Monllao
f560f3669e Merge branch 'MDL-63619-master' of git://github.com/andrewnicols/moodle 2018-10-24 09:48:16 +02:00
Andrew Nicols
eb514bb3e5 MDL-63714 javascript: Add new core/pending module 2018-10-24 12:49:09 +08:00
Andrew Nicols
f0bfedf348 MDL-63714 theme_boost: Fix aria focus behat issues 2018-10-24 12:45:13 +08:00
Andrew Nicols
66de50c366 Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle 2018-10-24 10:21:42 +08:00
Mark Nelson
d1e8e69d85 MDL-63466 core_message: deprecated methods and services 2018-10-24 09:40:07 +08:00
Mark Nelson
4f22d7f23b MDL-63466 core_message: removed get_last_message_time_created_cache_key 2018-10-24 09:39:59 +08:00
Mark Nelson
f978593d6c MDL-63466 core_message: rename cache for last message time 2018-10-24 09:39:42 +08:00
Sara Arjona
fb04293bb1 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.
2018-10-24 09:39:05 +08:00
Sara Arjona
d89d0d6593 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.
2018-10-24 09:38:10 +08:00
Sara Arjona
ecf7567a89 MDL-63466 core_message: Add conversationid to message class 2018-10-24 09:38:01 +08:00
Mihail Geshoski
1d3d4c66df MDL-63688 core_tag: Add method that returns users in context
This issue is part of the MDL-62560 Epic.
2018-10-24 09:31:19 +08:00
Jake Dallimore
042d804453 MDL-63466 core_message: added a test helper class
Providing util methods for api and externallib testing.
2018-10-24 09:27:34 +08:00
Jake Dallimore
2a2b86f123 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.
2018-10-24 09:23:30 +08:00
Andrew Nicols
d95ad08f85 MDL-63619 tool_dataprivacy: Cache purposes in form 2018-10-24 08:48:18 +08:00
Andrew Nicols
3b002c86eb MDL-63619 tool_dataprivacy: Performance improvement 2018-10-24 08:48:18 +08:00
Andrew Nicols
d2aed78933 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.
2018-10-24 08:48:18 +08:00
Andrew Nicols
4b7ad8845c MDL-63714 core: Wrap doRender in pendingjs 2018-10-24 08:12:10 +08:00
Andrew Nicols
dc39d0cf39 MDL-63714 javascript: Improve docs for pendingjs 2018-10-24 08:00:00 +08:00
Mihail Geshoski
8171cd7f3c MDL-63673 fileconverter_googledrive: Support removal of context users
This issue is part of the MDL-62560 Epic.
2018-10-24 07:02:16 +08:00
David Monllao
daf0b4f08b on-demand release 3.6dev+ 2018-10-23 16:42:13 +02:00
David Monllao
c45159318c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-10-23 16:42:12 +02:00
Andrew Nicols
8b5e087fc9 Merge branch 'MDL-63408_master-fix' of git://github.com/dmonllao/moodle 2018-10-23 21:23:47 +08:00
David Monllao
4abe3d250f MDL-63408 messaging: Remove duplicated field 2018-10-23 13:44:52 +02:00
David Monllao
ccd8a102c7 Merge branch 'MDL-62139-master-fix3' of git://github.com/damyon/moodle 2018-10-23 11:16:47 +02:00
Damyon Wiese
3ed1cec01e MDL-62139 behat: Invalid test
If javascript is disabled, we can't open the menu.
2018-10-23 16:47:20 +08:00
Damyon Wiese
a3d57af872 MDL-62139 output: Revert template changes
Revert accessibility changes for menus in standard themes.
2018-10-23 10:14:19 +02:00
Bas Brands
a7712a9851 MDL-63445 core_renderer: display course image in context header 2018-10-23 09:41:26 +02:00
Damyon Wiese
c8cd967f48 MDL-62139 output: Revert template changes
Revert accessibility changes for menus in standard themes.
2018-10-23 15:40:31 +08:00
Damyon Wiese
ff3fc0566c MDL-62139 output: Menus fixes
Change the boost custom behat step to click on a button.

Revert the clean templates to unchanged versions.
2018-10-23 15:27:13 +08:00
Mihail Geshoski
cc2b9d6683 MDL-63679 ltiservice_memberships: Support for removal of context users
This issue is part of the MDL-62560 Epic.
2018-10-23 13:33:48 +08:00
Mihail Geshoski
0c088088de MDL-63678 ltiservice_gradebookservices: Support removal of context users
This issue is part of the MDL-62560 Epic.
2018-10-23 13:04:30 +08:00
Andrew Nicols
5c77966881 MDL-63657 completion: Coding style fix 2018-10-23 11:32:43 +08:00
Andrew Nicols
33a007c4b4 Merge branch 'MDL-63668-master' of git://github.com/mickhawkins/moodle 2018-10-23 11:29:29 +08:00
Andrew Nicols
4b3ca0ebf2 MDL-63657 core_files: Coding style fix 2018-10-23 11:26:02 +08:00
Andrew Nicols
2612cf5673 Merge branch 'MDL-63640-master' of git://github.com/mihailges/moodle 2018-10-23 11:25:21 +08:00