mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-26 10:32:40 +01:00
Code Issues Projects Releases Wiki Activity
91,662 Commits 36 Branches 527 Tags
Commit Graph

1377 Commits

Author SHA1 Message Date
Mark Nelson
7c8ba89d5e MDL-64307 core_message: do not include disabled conversations in count 2018-12-04 11:48:16 +08:00
Eloy Lafuente (stronk7)
f47c8f3525 MDL-64300 upgrade: add 3.6.0 separation line to all upgrade scripts 2018-12-02 18:36:40 +01:00
David Monllao
823fc75421 Merge branch 'MDL-64282' of git://github.com/stronk7/moodle 2018-11-30 13:02:47 +01:00
Eloy Lafuente (stronk7)
085353b315 MDL-64282 versions: bump all versions and requires near release 
version = 2018120300 release version
requires= 2018112800 current rc2 (week7roll1) version
 2018-11-29 18:24:08 +01:00
Damyon Wiese
1a368ec351 Merge branch 'MDL-64264_master' of git://github.com/markn86/moodle 2018-11-29 14:46:55 +08:00
Mark Nelson
44b92ecdfc MDL-64264 core_message: use non-deprecated WS for deletion 
Also fixed typo in function name.
 2018-11-29 12:41:57 +08:00
Ryan Wyllie
9aaf61346f MDL-64245 message: fix scrollback for conversation loaded via contact 2018-11-29 10:46:13 +08:00
Jun Pataleta
7d82e35e39 MDL-64245 message: Ditch sender+lastmessage lang string for simplicity 
Passing the last message (which can virtually contain any character) as
a parameter for the {{#str}} mustache helper can break the JSON parsing
which eventually leads to the breakage of the messaging UI.
So for simplicity, revert the addition of the 'conversationlastmessage'
language string and render the sender and the last message as separate
elements.
 2018-11-29 10:45:22 +08:00
Ryan Wyllie
030f164ecc MDL-64245 message: fix contacts list height on Safari 10 2018-11-29 10:45:22 +08:00
Ryan Wyllie
b154e2bf7b MDL-64245 message: fix loading convo by id with lots of messages 2018-11-29 10:45:22 +08:00
Andrew Nicols
b1e01063a8 Merge branch 'MDL-64224-master' of https://github.com/snake/moodle 2018-11-28 12:02:34 +08:00
Ryan Wyllie
c337741524 MDL-64099 message: fix lazy load list overflow 2018-11-28 10:25:29 +08:00
Jun Pataleta
494575bc55 MDL-64099 message: Show last message for individual messages 2018-11-28 09:27:06 +08:00
Jake Dallimore
e412548506 MDL-64224 core_message: fix for isfavourite in api::get_conversation() 2018-11-28 09:09:07 +08:00
Bas Brands
f3194f39bb MDL-64099 message: group conversation heading html 
* Fix for IE11 group conversation header image sticking to group name
 2018-11-27 13:15:22 +01:00
Bas Brands
4d446b8814 MDL-64099 message: last message container minimum size 
* empty last message containers should have a minimum size
to ensure list-group-item element are in the right place.
 2018-11-27 12:44:43 +01:00
Andrew Nicols
1add1cd644 Merge branch 'MDL-64047-master' of https://github.com/snake/moodle 2018-11-27 11:51:48 +08:00
Ryan Wyllie
12d238100d MDL-64099 message: fix last message and date in group conversations 2018-11-27 10:51:39 +08:00
Bas Brands
4631749c5a MDL-64099 message: Hide scrollbar on section collapsing 2018-11-27 10:51:04 +08:00
Bas Brands
dfd6eec2b4 MDL-64099 message: Make collapsible headers bold 2018-11-27 10:51:04 +08:00
Bas Brands
986d1a20f6 MDL-64099 message: Move timestamps all the way to the right 2018-11-27 10:48:52 +08:00
Bas Brands
e2cf9af22d MDL-64099 message: conversation long sender names truncate 2018-11-27 10:48:52 +08:00
Bas Brands
2edfbf880a MDL-64099 message: Align group image to container top 2018-11-27 10:48:52 +08:00
Bas Brands
e677e0e53b MDL-64099 message: Replace badge with rectangular shape 2018-11-27 10:48:52 +08:00
Bas Brands
051c675fd2 MDL-64099 message: Add a border in between messages and contacts 2018-11-27 10:48:52 +08:00
Bas Brands
71b13a84a4 MDL-64099 message: Add sender name to conversation preview in overview 2018-11-27 10:48:52 +08:00
Ryan Wyllie
302586a5bc MDL-64099 message: Change icons for select and selected messages 2018-11-27 10:47:59 +08:00
Ryan Wyllie
41cc9fbb57 MDL-64099 message: move delete messages icon to the right 2018-11-27 10:47:59 +08:00
Ryan Wyllie
2809ab7b52 MDL-64099 message: Align the icons and avatar at the top of the header 2018-11-27 10:47:59 +08:00
Ryan Wyllie
c483a8eee7 MDL-64099 message: remove conversation name link underline 2018-11-27 10:47:59 +08:00
Ryan Wyllie
a009ce6014 MDL-64099 message: de-emphasize participant count in group conversation 2018-11-27 10:47:59 +08:00
Ryan Wyllie
a471607457 MDL-64099 message: increase margins between messages in conversations 2018-11-27 10:47:59 +08:00
Ryan Wyllie
af3cfc7729 MDL-64099 message: bold senders name in message 2018-11-27 10:47:59 +08:00
Andrew Nicols
999030766b Merge branch 'MDL-64139-master' of git://github.com/ryanwyllie/moodle 2018-11-27 09:17:18 +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
Ryan Wyllie
3528c86c12 MDL-64139 message: load conversation counts async 2018-11-26 14:36:35 +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
Jake Dallimore
cb38961988 MDL-64167 core_message: get_conversations() handles self conversations 
Those individual conversations created with one's self (via admin user
bulk actions) are now supported in get_conversations(). These had two
records with the same userid in the message_conversation_members table.
The following adjustments have been made to accomodate these:
- Member count adjusted to read 1, not 2 for 'self' conversations.
- Member information for the current user now returned for 'self'
conversations.
- The method now tracks 'self' conversations via $selfconversations.
 2018-11-26 08:52:54 +08:00
Jun Pataleta
beb7083381 Merge branch 'MDL-64057-master' of https://github.com/snake/moodle 2018-11-23 14:47:00 +08:00
Jake Dallimore
c296c48f66 MDL-64057 core_message: fix bug with favourite count aggregation 2018-11-23 14:42:33 +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
b694b9b8e2 MDL-64057 core_message: use get_conversation_counts() during rendering 2018-11-23 11:02:20 +08:00