mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-12 11:32:04 +01:00
Code Issues Projects Releases Wiki Activity
91,358 Commits 36 Branches 523 Tags
Commit Graph

1280 Commits

Author SHA1 Message Date
Ryan Wyllie
c75559cfff MDL-63303 message: move message drawer to end of <body> 
Fix some of the behat tests that are looking for generic button
names that match some of the buttons in the message drawer which
happen to appear earlier in the DOM.
 2018-11-15 14:43:22 +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
a111ab44af MDL-63303 message: fix bugs in message drawer part 2 
* Added missing icon mappings for font-awesome
* Fixed focus on dialogue button when it opens
* Fixed UI updates on user block / unblock
* Fix jQuery syntax error when sending message with quotes
* Fix message/index.php opening drawer when no conversation found
* Fix placeholders rendered for new requests
 2018-11-15 14:43:21 +08:00
Ryan Wyllie
1d3535f95c MDL-63303 message: fix bugs in message drawer 
* Fix navigation from view_contact to view_conversation on an action
  such as blocking
* Fix default open message section on overview page depending on which
  section has conversations
* Fix message/index.php for users who haven't yet started a
  conversation
 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
142b042c5c MDL-63303 message: message/index.php open conversation in message drawer 2018-11-15 14:43:21 +08:00
Ryan Wyllie
17d982d751 MDL-63303 message: message/edit.php opens setttings in message drawer 2018-11-15 14:43:21 +08:00
Ryan Wyllie
1e3453b7c7 MDL-63303 message: change nav popover to toggle message drawer 2018-11-15 14:43:21 +08:00
Ryan Wyllie
6f96c06374 MDL-63303 theme_bootstrapbase: add message drawer 2018-11-15 14:43:21 +08:00
Ryan Wyllie
5005d8cfb4 MDL-63303 message: add message drawer (boost only) 2018-11-15 14:43:21 +08:00
Ryan Wyllie
3ea46c8e31 MDL-63303 message: add functions to message_repository.js 2018-11-15 14:40:12 +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
b3bbd4a0e1 MDL-63303 message: fix get_conversations external func 2018-11-15 14:40:12 +08:00
Ryan Wyllie
569c0bae9c MDL-63303 message: add get_conversation_between_users external func 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
886b01783b MDL-63303 message: add fields to send_instant_message 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
8350978aa1 MDL-63303 message: add get_member_info external function 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
c61353ae41 MDL-63303 message: fix mark_all_conversation_messages_as_read ext func 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
Jun Pataleta
91194bfd9f Merge branch 'MDL-63974-master' of https://github.com/snake/moodle 2018-11-15 11:22:16 +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
Damyon Wiese
462fc2abcd Merge branch 'MDL-63901-master' of git://github.com/sarjona/moodle 2018-11-14 11:14:18 +08:00
David Monllao
50d37636b6 Merge branch 'MDL-63882-master' of git://github.com/damyon/moodle 2018-11-13 16:07:14 +01:00
Sara Arjona
8105af9d6b MDL-63901 core_message: Avoid duplicate last message 2018-11-13 10:38:38 +01:00
Damyon Wiese
bb650761c5 MDL-63882 core_message: Use validate_parameters 
external_api::validate_parameters() sets defaults, and does cleaning and sanitisation of the
inputs. It returns the cleaned params. We can't be re-using the arguments to this function
instead of the results, because they have not been cleaned.
 2018-11-13 10:54:05 +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
Sara Arjona
d9552c3c33 MDL-63901 core_message: Fix error when the conversation does not exist 
Create a conversation instead of throwing an exception to get the
behaviour working as it was before.
The string lang 'conversationdoesntexist' can be removed because
it was added in MDL-63466 and it's not used anywhere more.
 2018-11-12 10:15:59 +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
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
Damyon Wiese
6cfba4a1c6 MDL-63864 message: Contact request fix 
The contactrequestid was removed from the api, so now we search by both
the userid from and the userid to.
 2018-11-12 13:38:33 +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
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