83 Commits

Author SHA1 Message Date
Wolfgang Huß
858e3fdee8 Rename 'addRoom' to 'toggleUserSearch' in chat component 2023-07-20 10:40:04 +02:00
elweyn
6659238fa1 Add fetchRooms option & check null on content. 2023-07-20 10:15:15 +02:00
Hannes Heine
b126347aee
Merge branch 'master' into 6592-chat-component-+-button-open-search 2023-07-20 06:40:44 +02:00
Wolfgang Huß
3d9a9cd5a0 Create the chat room on user search in chats function 2023-07-19 17:47:56 +02:00
Markus
74dceb82f0 Merge branch '6588-chat-link-to-chat-page' of github.com:Ocelot-Social-Community/Ocelot-Social into 6588-chat-link-to-chat-page 2023-07-19 17:27:05 +02:00
Markus
45dba25a7a [fix] changed css rule for single chat icon 2023-07-19 17:24:37 +02:00
Wolfgang Huß
26282c67b7 Make user search in chats function – second step 2023-07-19 16:41:23 +02:00
Hannes Heine
e87078c2fc
Merge branch 'master' into 6588-chat-link-to-chat-page 2023-07-19 16:25:01 +02:00
Markus
5bae7cbd94 [feature] open chat page via link from single chat window and open the used room after loading 2023-07-19 15:54:31 +02:00
Wolfgang Huß
ffe51a0743 Separate 'ds-select' of 'AddGroupMember' into separate component 'SelectUserSearch' 2023-07-19 15:48:05 +02:00
ea368cd0f3
lint fixes 2023-07-19 15:09:13 +02:00
2f76d0b502
fix lastMessage to contain proper values 2023-07-19 14:38:23 +02:00
Wolfgang Huß
a114b8a12c Give the chat plus button a function and show hide the user search 2023-07-19 14:07:10 +02:00
Hannes Heine
e4e365d90e
Merge branch 'master' into 6568-highlight-username-chat 2023-07-19 13:46:11 +02:00
779d564159
lint fixes 2023-07-19 11:53:13 +02:00
24187bf8a9
increase unreadCount when receiving a message, fix problem with empty room 2023-07-19 11:45:36 +02:00
f7dd605838
shorten room message, update room message when sending 2023-07-19 11:36:35 +02:00
41cca4f4ec
lint 2023-07-19 10:42:21 +02:00
961a260044
remove default avatar, allow refetch rooms, count down read messages, update lastMessage & lastMessageAt, ... 2023-07-19 10:39:54 +02:00
Markus
0bc19cf226 [fix] added usertag as allowed html tags, so user highlighting works for the chat 2023-07-19 10:15:56 +02:00
Wolfgang Huß
ef95f12339 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6589-on-open-chat-room-page-close-or-on-change-profile-change-mini-chat 2023-07-18 18:30:49 +02:00
Wolfgang Huß
b85d5345a0 Clean up 2023-07-18 18:30:03 +02:00
Wolfgang Huß
c7deefa563 Close small chat if one changes to the chat room page 2023-07-18 17:33:45 +02:00
33ecc4764e
linting 2023-07-18 10:54:27 +02:00
d7aba44fbe
removed console log and fixed reloading of messages 2023-07-18 10:48:42 +02:00
2e7adb4eb3
Merge branch 'master' into chat-notifications2 2023-07-17 22:29:03 +02:00
Moriz Wahl
4b2fae9a2c do not await for mark messages as seen 2023-07-17 19:52:41 +02:00
Moriz Wahl
74af799217 unread room count in store 2023-07-17 19:28:56 +02:00
Moriz Wahl
829ea5ee0c Merge branch 'master' into chat-notifications 2023-07-17 18:37:28 +02:00
Moriz Wahl
846fe26091 some changes 2023-07-17 18:34:35 +02:00
Moriz Wahl
ec9d488b3c
Merge branch 'master' into mark-messages-as-read 2023-07-17 16:08:55 +02:00
Moriz Wahl
b1102f6e3e only mark other users messages as seen 2023-07-17 16:07:12 +02:00
19e441b449
more changeset reduction 2023-07-17 15:06:37 +02:00
4a9199229b
redurce changeset 2023-07-17 15:05:51 +02:00
56060c6573
Merge branch 'master' into mark-messages-as-read 2023-07-17 15:04:02 +02:00
mahula
466f67445e
Merge branch 'master' into 6534-chat-room-usertag 2023-07-17 15:01:45 +02:00
ced4996f47
implement chatMessageAdded subscription 2023-07-17 14:55:57 +02:00
mahula
28596b2db3
Merge branch 'master' into 6557-chat-reactive-language-switch 2023-07-17 12:58:30 +02:00
9ab8fd7561
Merge branch 'master' into chat-last-seen-webapp 2023-07-17 10:10:14 +02:00
121093342b
Merge branch 'master' into chat-pagniate-rooms 2023-07-17 09:30:02 +02:00
cfc34495a7
Merge branch 'master' into 6557-chat-reactive-language-switch 2023-07-17 01:01:51 +02:00
elweyn
5dfdcc9bc2 fix(webapp): show room header images. 2023-07-15 19:00:46 +02:00
775a3ddb72
strip datetime down to date in message 2023-07-15 12:35:44 +02:00
ab91413bf3
typo 2023-07-15 10:43:08 +02:00
0cb45cd8f6
removed refetch message method 2023-07-15 10:42:10 +02:00
851dd2e3e6
lint fixes 2023-07-15 10:40:18 +02:00
f05a0bc544
frontend paginate rooms 2023-07-15 10:38:19 +02:00
dafdd26eb6
Merge branch 'master' into 6557-chat-reactive-language-switch 2023-07-15 01:39:14 +02:00
2947ad635c
Merge branch 'master' into 6534-chat-room-usertag 2023-07-15 01:25:05 +02:00
Moriz Wahl
db594650f9 feat(webapp): mark messages as seen 2023-07-14 18:53:56 +02:00