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

422 commits

Author SHA1 Message Date
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
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
2553e9db8e MDL-63724 core_message: add send_messages_to_conversation() web service 2018-11-12 10:09:27 +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
aa083ab95f MDL-63724 core_message: add new group_message_sent event 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
b3ce575e63 MDL-63864 core_message: added unit tests 2018-11-09 13:28:39 +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
5c675c5076 MDL-63850 core_message: '$referenceuserid' used when returning requests 2018-11-08 16:05:25 +08:00
Amaia Anabitarte
36e23989b0 MDL-63282 core_message: Setting messagingallusers = 1 for behat tests 
Default setting value for new instances is 0
Default setting value for existing instances is 1
to get same search results than before this setting exists

Setting messagingallusers = 1 for behat tests to simulate old versions functionality

Followup: MDL-63911
 2018-11-08 13:11:28 +08:00
Amaia Anabitarte
548cac7dbf MDL-63282 core_message: New Search API function 2018-11-08 13:11:28 +08:00
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