ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,317 Commits 117 Branches 1,511 Tags
Commit Graph

14317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Heine
61ce0156d1
Merge branch 'master' into chat-pagniate-rooms 2023-07-16 13:18:35 +02:00
Hannes Heine
a97af3e418
Merge pull request #6561 from Ocelot-Social-Community/chat-seed 
feat(backend): chat seed
b2.7.0-486 		2023-07-16 13:17:25 +02:00
elweyn
5dfdcc9bc2 fix(webapp): show room header images. 2023-07-15 19:00:46 +02:00
Ulf Gebhardt
1e7f579378
adjust tests 2023-07-15 12:51:43 +02:00
Ulf Gebhardt
661c2f1b71
implement room order 2023-07-15 12:51:33 +02:00
Ulf Gebhardt
775a3ddb72
strip datetime down to date in message 2023-07-15 12:35:44 +02:00
Ulf Gebhardt
2d3483dc1b
query additional data for messages 2023-07-15 12:35:26 +02:00
Ulf Gebhardt
66cd66d71a
test room pagination and singleRoom query 2023-07-15 12:03:53 +02:00
Ulf Gebhardt
ab91413bf3
typo 2023-07-15 10:43:08 +02:00
Ulf Gebhardt
0cb45cd8f6
removed refetch message method 2023-07-15 10:42:10 +02:00
Ulf Gebhardt
851dd2e3e6
lint fixes 2023-07-15 10:40:18 +02:00
Ulf Gebhardt
5f4a973e2a
backend allow room filter by id for single rooms 2023-07-15 10:38:35 +02:00
Ulf Gebhardt
f05a0bc544
frontend paginate rooms 2023-07-15 10:38:19 +02:00
Ulf Gebhardt
dafdd26eb6
Merge branch 'master' into 6557-chat-reactive-language-switch 2023-07-15 01:39:14 +02:00
Ulf Gebhardt
2947ad635c
Merge branch 'master' into 6534-chat-room-usertag 2023-07-15 01:25:05 +02:00
Moriz Wahl
3d4def7c10
Merge branch 'master' into new-room-properties 2023-07-14 19:56:42 +02:00
Moriz Wahl
db594650f9 feat(webapp): mark messages as seen 2023-07-14 18:53:56 +02:00
Moriz Wahl
c46d0064fc unread rooms query in chat notification 2023-07-14 14:50:43 +02:00
Moriz Wahl
d7746e5904 clean db after all 2023-07-14 14:44:41 +02:00
Moriz Wahl
09be4d3442 test unread rooms query 2023-07-14 14:40:38 +02:00
Moriz Wahl
f4567b14ff feat(backend): unread rooms query 2023-07-14 13:25:57 +02:00
Moriz Wahl
4310b3fa48 create message mutation returns full message object 2023-07-14 12:51:54 +02:00
Moriz Wahl
b9b9fea1dd test unread count 2023-07-14 12:38:46 +02:00
Moriz Wahl
1fd67aa581 add unreadCount property 2023-07-14 12:34:12 +02:00
Moriz Wahl
2fe93892a1 full room object for create room mutation 2023-07-14 12:21:40 +02:00
Moriz Wahl
1d92b40f50 lastMessage in room working 2023-07-14 11:52:51 +02:00
Wolfgang Huß
40b40eb486 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6545-add-headline-to-chat-page 2023-07-14 11:44:28 +02:00
Wolfgang Huß
53a320fb9d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6545-add-headline-to-chat-page 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
 2023-07-14 11:40:24 +02:00
Markus
b4804cef7c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-07-14 11:15:07 +02:00
Ulf Gebhardt
54cf5b37a5
order by indexId instead of createdAt 2023-07-14 11:09:04 +02:00
Ulf Gebhardt
55b3bc999a
use a prime for seeding to allow testing of the pagination 2023-07-14 10:59:38 +02:00
Ulf Gebhardt
eae7b53adf
reduce message count to 1000 instead of 10000 to reduce seed time 2023-07-14 10:56:02 +02:00
Ulf Gebhardt
75b63c3caa
Merge branch 'master' into chat-seed 2023-07-14 10:42:45 +02:00
Ulf Gebhardt
f9da762253
implemented chat seed 2023-07-14 10:42:20 +02:00
Ulf Gebhardt
b933305cad
Merge pull request #6549 from Ocelot-Social-Community/message-pagination 
feat(webapp): chat message pagination
b2.7.0-485 		2023-07-14 10:28:20 +02:00
Ulf Gebhardt
faa474dcf6
fixed merge problem 2023-07-14 09:19:56 +02:00
Ulf Gebhardt
a9ad8c34c8
Merge branch 'master' into message-pagination 2023-07-14 09:13:40 +02:00
Moriz Wahl
5376e171bd trying last message prop in room 2023-07-14 09:11:32 +02:00
mahula
65a6e219db
Merge pull request #6553 from Ocelot-Social-Community/6537-chat-remove-reply-smileys 
feat(webapp): chat remove reply smileys
b2.7.0-484 		2023-07-14 08:19:36 +02:00
Markus
d496aef0a4 fixed linting 2023-07-13 22:56:38 +02:00
Markus
d73fd0cbb7 [bug] chat language is now reactive 2023-07-13 22:35:48 +02:00
Markus
f4bf763701 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-07-13 22:25:16 +02:00
mahula
db7c8d55e5
Merge branch 'master' into 6537-chat-remove-reply-smileys 2023-07-13 19:16:27 +02:00
mahula
eaad9425a7
Merge pull request #6552 from Ocelot-Social-Community/6536-chat-remove-message-actions 
feat(webapp): remove message actions for chat
b2.7.0-483 		2023-07-13 19:15:19 +02:00
Moriz Wahl
032bca1b64 add last message at, use cypher statements for roomName and avatar 2023-07-13 19:09:17 +02:00
Markus
82bda3ffa5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social 2023-07-13 18:49:48 +02:00
mahula
acf45ace4f
Merge branch 'master' into 6536-chat-remove-message-actions 2023-07-13 16:03:38 +02:00
Moriz Wahl
d9510b0739
Merge pull request #6547 from Ocelot-Social-Community/more-message-props 
feat(backend): more message props
b2.7.0-482 		2023-07-13 16:00:38 +02:00
Hannes Heine
4e6b927452
Merge branch 'master' into 6536-chat-remove-message-actions 2023-07-13 15:17:58 +02:00
Moriz Wahl
7864809036
Merge branch 'master' into more-message-props 2023-07-13 15:17:07 +02:00