Andrew Nicols
2f7076ebf2
MDL-63692 message: Resolve bad merge conflict
2018-11-20 09:04:53 +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
6b036d04cf
MDL-63692 core_message: Fix the context for favourite conversations
...
The converation favourites were previously set in the system context
which is not right, as they should be stored:
- In the conversation context when defined.
- In the user context, when contextid is null (that means is an
individual conversation).
2018-11-19 22:08:28 +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
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
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
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
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
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
054834b00c
MDL-63850 core_message: moved contact request logic to helper
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
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
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
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
Jun Pataleta
67d2082849
Merge branch 'MDL-63725_master' of git://github.com/markn86/moodle
2018-11-01 12:39:43 +08:00
Mark Nelson
6ecd6e5ba8
MDL-63725 core_message: added api::get_conversation_members
2018-11-01 11:18:20 +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
74138e927c
Revert "MDL-63466 core_message: rename cache for last message time"
...
This reverts commit f978593d6c
2018-10-26 14:54:01 +08:00
Andrew Nicols
4699b8bc41
Revert "MDL-63466 core_message: removed get_last_message_time_created_cache_key"
...
This reverts commit 4f22d7f23b
2018-10-26 14:53:58 +08:00
Andrew Nicols
621e7eb022
Merge branch 'MDL-63466-master' of https://github.com/snake/moodle
2018-10-26 12:33:13 +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
