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

295 commits

Author SHA1 Message Date
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
Ryan Wyllie
d3d95d5dc2 MDL-63303 message: fix bugs in message drawer part 4 
* Add clarification to delete messages lang strings
* Stop message polling when sending a message to fix UI bug
* Publish update last message event when polling finds more messages
* Remove logged in user from group conversation participants list
* Use user object to fetch user preferences to reduce DB calls
* Remove animated slide transitions because the browser breaks when
  showing some conversations
 2018-11-16 14:10:10 +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
0802c38a2f MDL-63303 message: add lastmessagedate to messagearea contact 2018-11-15 14:40:12 +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
38004e777f MDL-63303 message: fix get_member_info iscontact check 2018-11-15 14:40:12 +08:00
Ryan Wyllie
32b4212e50 MDL-63303 message: fix get_conversation_messages 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
Jake Dallimore
9acb8b3574 MDL-63974 core_message: restore legacy behaviour for search_users() 2018-11-15 09:58:02 +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
Eloy Lafuente (stronk7)
49971e66f7 Merge branch 'MDL-63907-master' of git://github.com/cescobedo/moodle 2018-11-12 12:07:45 +01: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
b0f45a8b8f Merge branch 'MDL-63724-master-3' of https://github.com/snake/moodle 2018-11-12 14:16:31 +08:00
Damyon Wiese
75e6661940 Merge branch 'MDL-63909_master' of git://github.com/markn86/moodle 2018-11-12 14:01:01 +08:00
Andrew Nicols
e926b4d046 MDL-63968 message: Correct use of get_in_or_equal 2018-11-12 10:32:06 +08:00
Jake Dallimore
52f9cf205e MDL-63724 core_message: add send_message_to_conversation() to api 2018-11-12 10:09:27 +08:00
Jake Dallimore
9f82758c01 MDL-63724 core_message: fix method signature for can_contact_user() 
This method required objects, but only used their ids, so has been
changed to require only ids.
 2018-11-12 10:09:27 +08:00
Jake Dallimore
8e3bf150d9 MDL-63724 core_message: add can_send_message_to_conversation() to api 2018-11-12 10:09:27 +08:00
Damyon Wiese
080cc5b671 Merge branch 'MDL-63864_master' of git://github.com/markn86/moodle 2018-11-12 10:02:25 +08:00
Andrew Nicols
e2a8ebddb5 Merge branch 'MDL-63850_master' of git://github.com/markn86/moodle 2018-11-12 07:53:09 +08:00
Jake Dallimore
d76029110b MDL-63884 core_message: fix for get_conversations legacy adapter code 
This code also tries to adapt other conversation types, but it should
only support individual conversations, where we know members exist.
 2018-11-09 17:59:55 +08:00
Jake Dallimore
9cef5491fb MDL-63884 core_message: fix for groups without images 
If we don't have an image for the group, leave this extra field empty.
 2018-11-09 17:59:53 +08:00
Mark Nelson
accd64827d MDL-63864 core_message: can now specify limit for contact requests 2018-11-09 13:28:38 +08:00
Mark Nelson
daa33803cd MDL-63864 core_message: get_contact_requests now uses helper 2018-11-09 12:12:17 +08:00
Mark Nelson
4461288dfa MDL-63909 core_message: undeprecated still used functions by old UI 
A note has been made to remove these and other functions once we
remove the old UI.
 2018-11-08 18:43:17 +08:00
Mark Nelson
cef1d977c3 MDL-63850 core_message: get_conversations returns privacy and requests 2018-11-08 16:24:29 +08:00
Mark Nelson
82e0973c96 MDL-63850 core_message: helper now returns privacy information 2018-11-08 16:05:25 +08:00
Mark Nelson
5c675c5076 MDL-63850 core_message: '$referenceuserid' used when returning requests 2018-11-08 16:05:25 +08:00
Mark Nelson
054834b00c MDL-63850 core_message: moved contact request logic to helper 2018-11-08 16:05:25 +08:00
Mark Nelson
6981de1080 MDL-63850 core_message: prevent exception being thrown with empty array 2018-11-08 16:05:25 +08:00
Amaia Anabitarte
548cac7dbf MDL-63282 core_message: New Search API function 2018-11-08 13:11:28 +08:00
cescobedo
4cdc9f73b8 MDL-63907 core_message: Pass user object to show_online_status. 
Fix create_contact() to pass user object as parameter in show_online_status.
 2018-11-07 17:05: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
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