moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
96886 commits 37 branches 540 tags 1.3 GiB
Commit graph

381 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
3c577cb583 Merge branch 'MDL-63883-master' of https://github.com/snake/moodle 2018-11-07 10:48:12 +01:00
Damyon Wiese
d4035711f9 Merge branch 'MDL-63898-master' of https://github.com/snake/moodle 2018-11-07 15:30:52 +08:00
Damyon Wiese
da151c9b75 Merge branch 'MDL-63839_master' of git://github.com/markn86/moodle 2018-11-07 14:29:02 +08:00
Jake Dallimore
74fc14e5b2 MDL-63898 core_message: fix for get_conversations message formatting 
This used to return a text version of the message, but needs to return
the message formatted with message_format_message_text().
 2018-11-07 14:23:54 +08:00
Damyon Wiese
eb935dab5b Merge branch 'MDL-63884-master' of https://github.com/snake/moodle 2018-11-07 11:00:41 +08:00
Jake Dallimore
003cdcce15 MDL-63884 core_message: add imageurl support for linked conversations 
This is an extra field specific to linked conversations, so the helper
method has been extended to encompass this alongside the subname field.
 2018-11-06 16:51:44 +08:00
Jake Dallimore
741376f3e7 MDL-63883 core_message: fix random externnallib_test phpunit failure 
Users created by the test generator could have the same name as one
another, so trying to assert names NOT in an array would clash. Fix
is to remove those assertions - there were superfluous anyway.
 2018-11-06 14:17:51 +08:00
Mark Nelson
27024d830c MDL-63839 core_message: use component name for Behat tag 2018-11-05 10:35:51 +08:00
Andrew Nicols
e4384a6a56 Merge branch 'MDL-63712-master' of git://github.com/mickhawkins/moodle 2018-11-05 09:33:42 +08:00
Damyon Wiese
fb3ab37a67 Merge branch 'MDL-63549-master' of https://github.com/snake/moodle 2018-11-02 10:17:54 +08:00
Jake Dallimore
aa74835164 MDL-63549 core_message: exclude conversations where all messages deleted 
If there are no recent messages for an individual conversation for the
user, then we exclude that conversation from the results.
 2018-11-02 10:10:37 +08:00
Michael Hawkins
b8bbef0a9b MDL-63712 core_message: Unit test improvements for fetching context/user 
This issue is part of the MDL-62560 Epic.
 2018-11-01 16:51:12 +08:00
Jun Pataleta
d0b05c8d05 Merge branch 'MDL-63725_master' of git://github.com/markn86/moodle 2018-11-01 16:11:06 +08:00
Mark Nelson
bc667050a4 MDL-63725 core_message: do not allow access to all conversation members 2018-11-01 15:56:07 +08:00
Shamim Rezaie
ba81c26c79 MDL-63712 core_message: support removal of multiple users in a context 
This issue is a part of the MDL-62560 Epic.
 2018-11-01 12:43:21 +08:00
Shamim Rezaie
5233429642 MDL-63712 core_message: Data should be in user context, not system 
This issue is a part of the MDL-62560 Epic.
 2018-11-01 12:43:14 +08:00
Jun Pataleta
67d2082849 Merge branch 'MDL-63725_master' of git://github.com/markn86/moodle 2018-11-01 12:39:43 +08:00
Mark Nelson
5584c48a33 MDL-63725 core_message: added get_conversation_members web service 2018-11-01 11:18:20 +08:00
Mark Nelson
6ecd6e5ba8 MDL-63725 core_message: added api::get_conversation_members 2018-11-01 11:18:20 +08:00
Jake Dallimore
6f31927af8 MDL-63549 core_message: add get_conversations web service 2018-10-31 08:16:32 +08:00
Jake Dallimore
eb5865da8b MDL-63549 core_message: add group support to api::get_conversations 
- Added support for returning group conversations
- Added support for conversation type filtering
- Added support for NO favourites, or ONLY favourites restrictions.
 2018-10-31 08:16:31 +08:00
Andrew Nicols
621e7eb022 Merge branch 'MDL-63466-master' of https://github.com/snake/moodle 2018-10-26 12:33:13 +08:00
Jake Dallimore
b95e4c786c 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.
 2018-10-26 12:26:23 +08:00
Mark Nelson
76540bec52 MDL-63280 core: removed 'message_conversation_area' table 
These new fields have been added to the 'message_conversations'
table.
 2018-10-25 18:05:20 +08:00
Mark Nelson
5571af1614 MDL-63280 core_message: added constants for enabled/disabled 2018-10-25 17:51:34 +08:00
Mark Nelson
f0e137c539 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.
 2018-10-25 17:51:04 +08: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
Mark Nelson
d1e8e69d85 MDL-63466 core_message: deprecated methods and services 2018-10-24 09:40:07 +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
Andrew Nicols
0ff384dbf1 Merge branch 'MDL-63548_master' of git://github.com/markn86/moodle 2018-10-23 10:25:54 +08:00
Mark Nelson
09ec501781 MDL-63548 core_message: added mark_all_conversation_messages_as_read WS 2018-10-23 09:52:43 +08:00
Mark Nelson
abf7a261a9 MDL-63548 core_message: added api::can_mark_all_messages_as_read 2018-10-23 09:52:14 +08:00
Andrew Nicols
67b813514c Merge branch 'MDL-63408_master' of git://github.com/markn86/moodle 2018-10-23 08:50:40 +08:00
Andrew Nicols
9c6ccfd93b Merge branch 'MDL-63213-master-2' of https://github.com/snake/moodle 2018-10-22 10:54:56 +08:00
Andrew Nicols
7b73fd183c Merge branch 'MDL-63691_master' of git://github.com/markn86/moodle 2018-10-22 10:52:13 +08:00
Mark Nelson
d9a25f397d MDL-63408 core_message: removed usage of deprecated method in tests 
Also, added tests to ensure exception is thrown if you try to
add or remove members to/from an individual conversation.
 2018-10-22 10:26:37 +08:00
Amaia Anabitarte
623048af81 MDL-63408 core_message: New functions to manage conversation members 
New functions created to add, remove and count conversation members
 2018-10-22 10:26:10 +08:00
Mark Nelson
f2ac0a3e5b MDL-63691 core_message: added api::create_conversation 2018-10-22 10:21:28 +08:00
Mark Nelson
e66b915c40 MDL-63691 core_message: added api::can_create_group_conversation 2018-10-22 10:21:27 +08:00
Jake Dallimore
5b367baef8 MDL-63213 core_message: add web services for set/unset favourites 2018-10-22 09:56:06 +08:00
Jake Dallimore
b8ff2c4481 MDL-63213 core_message: update get_conversations to support favourites 
Added the type param here, which will be used in MDL-63549.
 2018-10-22 09:43:33 +08:00
Sara Arjona
e5eba802d5 MDL-63289 message: Deprecate is_user_non_contact_blocked method 
This function has been deprecated and no other function has been
added to replace it. It was only called from can_post_message, so
its code has been moved there.
 2018-10-20 08:36:24 +02:00
Sara Arjona
7983fb830e MDL-63289 message: Bypass privacy user preferences for teachers 
Created capability 'moodle/site:messageanyuser' to allow
bypass user privacy preferences for messaging participants in a course,
even when some of them has blocked the teacher.
 2018-10-20 08:35:17 +02:00
David Monllao
32b01d2b02 Merge branch 'MDL-63214-master' of git://github.com/sarjona/moodle 2018-10-17 15:55:44 +02:00
Sara Arjona
f7dfa9ba3e MDL-63214 message: Add privacy preferences to filter who can message 
Add new messaging profile preferences to allow users to choose who
can message them:
- By default, users can select between 'My contacts only' and 'My
contacts and anyone in my courses'
- When $CFG->messagingallusers is enabled, a new option is displayed
also: 'Anyone on the site'. For users who have selected this option,
if $CFG->messagingallusers is disabled, the behaviour will be changed
to 'My contacts and anyone in my courses'
 2018-10-17 11:52:57 +02:00
Mark Nelson
60b67bbcf7 MDL-63547 core_message: web service can delete multiple conversations 2018-10-17 12:05:16 +08:00
Mark Nelson
26f39c8861 MDL-63547 core_message: added delete_conversation_by_id web service 2018-10-17 12:05:16 +08:00
Mark Nelson
15663b0bec MDL-63547 core_message: can_delete_conversation expects a conversationid 2018-10-17 12:05:16 +08:00
Mark Nelson
263ad98436 MDL-63547 core_message: deprecated api::delete_conversation() 2018-10-17 12:05:16 +08:00