mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-31 05:52:51 +02:00
Code Issues Projects Releases Wiki Activity
91,911 Commits 36 Branches 527 Tags
bbf60b1412
Commit Graph

297 Commits

Author SHA1 Message Date
Bas Brands
442f142522 MDL-64038 core_message: add default group image 
add default group image to improve the alignment
of group names in the message drawer group messages section
 2018-12-14 14:09:28 +01:00
Mark Nelson
7c8ba89d5e MDL-64307 core_message: do not include disabled conversations in count 2018-12-04 11:48:16 +08:00
Andrew Nicols
b1e01063a8 Merge branch 'MDL-64224-master' of https://github.com/snake/moodle 2018-11-28 12:02:34 +08:00
Jake Dallimore
e412548506 MDL-64224 core_message: fix for isfavourite in api::get_conversation() 2018-11-28 09:09:07 +08:00
Andrew Nicols
1add1cd644 Merge branch 'MDL-64047-master' of https://github.com/snake/moodle 2018-11-27 11:51:48 +08:00
Jake Dallimore
e4088b7582 MDL-64047 core_message: test get_contact_requests() with blocked users 2018-11-27 08:55:35 +08:00
Jake Dallimore
e492a5540d MDL-64047 core_message: contact request count must exclude blocked users 2018-11-27 08:46:25 +08:00
Jake Dallimore
36fabf72c0 MDL-64140 core_message: test unread counts with dataprovider in api 
The 3 methods used to test this function are superceded by the cases in
the dataprovider, so let's remove these and use the provider instead.
 2018-11-26 10:54:29 +08:00
Jake Dallimore
b402a163e3 MDL-64140 core_message: add get_unread_conversation_counts() web service 2018-11-26 10:54:18 +08:00
Jake Dallimore
7f6f45c460 MDL-64167 core_message: fix counts to exclude 'self' conversations 2018-11-26 08:52:55 +08:00
Jake Dallimore
425f5adcca MDL-64167 core_message: get_conversations() excludes self conversations 
The UI can't handle these, so for now, let's not return them.
 2018-11-26 08:52:55 +08:00
Damyon Wiese
35889e23b7 Merge branch 'MDL-64180_master' of git://github.com/markn86/moodle 2018-11-23 12:21:13 +08:00
Mark Nelson
7d678923b3 MDL-64180 core_message: added new WS for contact request count 2018-11-23 11:34:55 +08:00
Mark Nelson
720cc99331 MDL-64180 core_message: change stdClass to int for count requests param 
This will be used by a new web service and we do not want to fetch
the user unnecessarily in the call.

Also renamed the method for consistency.
 2018-11-23 11:34:40 +08:00
Jun Pataleta
252f0e16ea Merge branch 'MDL-64057-master' of https://github.com/snake/moodle 2018-11-23 11:24:58 +08:00
Jake Dallimore
0847aa120c MDL-64057 core_message: return conversations with soft-deleted users 
Individual conversations with a soft-deleted user (including messages)
are now displayed in the conversation listing. This brings the behaviour
of individual conversations in line with group conversations, in that
the active user can still view messages.
 2018-11-23 11:02:20 +08:00
Jake Dallimore
28ff6ad1da MDL-64057 core_message: add get_conversation_counts() web service 2018-11-23 11:02:20 +08:00
Jake Dallimore
8e91aaabc9 MDL-64057 core_message: consolidate conversation counts into single call 
Counts for types (individual, group) and favourites can be fetched with
a single API call.
 2018-11-23 11:02:19 +08:00
Mark Nelson
c9b0f33f78 MDL-64018 core_message: added external::get_user_contacts 
This is to replace usages of external::data_for_messagearea_contacts
in the new UI.
 2018-11-21 11:09:55 +08:00
Mark Nelson
715c45aac9 MDL-64018 core_message: added api::get_user_contacts 
This is to replace api::get_contacts when that gets deprecated.
 2018-11-21 11:09:11 +08:00
Jun Pataleta
918776482a MDL-63692 message: Set canonicalize to true for array comparison 2018-11-20 14:41:40 +08:00
Andrew Nicols
ffd303146f MDL-63692 message: Fix unit test assumption 
Contact requests do not cause notifications.
 2018-11-20 14:40:39 +08:00
Andrew Nicols
b20a6a4af6 Merge branch 'MDL-64024-master' of git://github.com/snake/moodle 2018-11-20 12:26:09 +08:00
Sara Arjona
4f97ea8856 MDL-64024 message: Fix lib::get_messages to get only individual messages 
From 3.6 users can have also group conversations, so it's needed to review
the messages_get_messages function to make sure only returns the
individual messages between 2 users.
 2018-11-20 10:44:27 +08:00
Andrew Nicols
08cd15658a Merge branch 'MDL-63692-master' of git://github.com/sarjona/moodle 2018-11-20 07:51:40 +08:00
Sara Arjona
16913e60b3 MDL-63692 core_message: Add favourite conversations to Privacy API 2018-11-19 22:09:13 +01:00
Sara Arjona
201cebeae5 MDL-63692 core_message: Add conversation support to Privacy API 2018-11-19 22:08:22 +01:00
Andrew Nicols
90a4438139 Merge branch 'MDL-64035-master' of https://github.com/snake/moodle 2018-11-19 15:08:22 +08:00
Andrew Nicols
237786f159 Merge branch 'MDL-63913-master' of https://github.com/snake/moodle 2018-11-19 14:59:39 +08:00
Jake Dallimore
a54115355a MDL-63913 core_message: fix to ensure favourites is exclusive 
If a conversation is included in the favourites unread count, it
cannot be included in any other type-based counts.
 2018-11-19 13:51:40 +08:00
Jun Pataleta
8699a985bc Merge branch 'MDL-64034-master' of https://github.com/snake/moodle 2018-11-19 12:59:22 +08:00
Jake Dallimore
d2708759d8 MDL-64034 core_message: return conversationid in search_messages() 2018-11-19 10:23:15 +08:00
Jake Dallimore
33022ee1d5 MDL-63913 core_message: add method to get unread conversation counts 2018-11-19 09:48:58 +08:00
Jake Dallimore
18550c0afb MDL-64035 core_message: get_conversations() excludes disabled chats 
Linked conversations which have been disabled must be excluded from
the results.
 2018-11-16 12:04:24 +08:00
Mark Nelson
52beee65b2 MDL-63303 core_message: dont check online status for deleted users 2018-11-15 18:08:12 +08:00
Ryan Wyllie
663ccd58ed MDL-63303 message: fix bugs in message drawer part 3 
* Fix bug for newly created conversations being added to overview page
* Fixed bug with use enter to send preference not updating correctly
* Fix unit tests
* Fix race condition loading new messages while conversation resetting
* Fix ordering and rendering of messages with same timestamp
* Fix missing privacy info in get_conversation web service
* Fix linting errors
* Improve bulk message rendering
 2018-11-15 14:43:21 +08:00
Ryan Wyllie
8c8939c1ae MDL-63303 message: add enter to send user preference 2018-11-15 14:43:21 +08:00
Ryan Wyllie
f074d6f086 MDL-63303 message: remove behat tests for messaging 2018-11-15 14:43:21 +08:00
Ryan Wyllie
ecb4755c91 MDL-63303 message: add count_contacts api function 2018-11-15 14:40:12 +08:00
Ryan Wyllie
4e3130269c MDL-63303 message: add get_conversation to message api 2018-11-15 14:40:12 +08:00
Ryan Wyllie
6399c7ef14 MDL-63303 message: add count_conversations to api 2018-11-15 14:40:12 +08:00
Ryan Wyllie
0866b33635 MDL-63303 message: add fields to contact requests 2018-11-15 14:40:12 +08:00
Ryan Wyllie
9e189a914d MDL-63303 core_favourites: add get and count functions 2018-11-15 14:40:11 +08:00
Jake Dallimore
41485be2c8 MDL-63974 core_message: fix logic for non-contacts in user search 
This should depend on the messagingallusers setting and, if false,
should only return those users having a profile the searcher can see.
If true, then any user can be returned. There is no requirement to
have a conversation with the user.
 2018-11-15 09:59:39 +08:00
Jun Pataleta
657c74416d Merge branch 'MDL-63834_master' of git://github.com/markn86/moodle 2018-11-13 09:35:23 +08:00
Mark Nelson
869eac8204 MDL-63834 core_message: validate conversation type before creating 2018-11-13 08:41:26 +08:00
David Monllao
623995e589 Merge branch 'MDL-63968-master' of git://github.com/andrewnicols/moodle 2018-11-12 10:02:17 +01:00
Damyon Wiese
eac24f2b71 Merge branch 'MDL-63945_master' of git://github.com/markn86/moodle 2018-11-12 16:36:57 +08:00
Mark Nelson
d15c1e77b0 MDL-63945 core_message: fixed discrepancy between helpers 2018-11-12 15:30:30 +08:00
Damyon Wiese
b0f45a8b8f Merge branch 'MDL-63724-master-3' of https://github.com/snake/moodle 2018-11-12 14:16:31 +08:00