5313 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	f9dad608c7	Merge branch 'master' into chat-last-messages	2023-07-18 15:22:56 +02:00
Moriz Wahl	342d60d21f	Merge branch 'chat-notifications2' of github.com:Ocelot-Social-Community/Ocelot-Social into chat-notifications2	2023-07-18 13:23:13 +02:00
Ulf Gebhardt	e47a558c80	Merge branch 'master' into chat-notifications2	2023-07-18 12:54:38 +02:00
Moriz Wahl	81a08ff04e	query all props on add message subscription	2023-07-18 12:47:23 +02:00
Wolfgang Huß	1bc7472068	Merge branch 'master' into 6545-add-headline-to-chat-page	2023-07-18 11:40:25 +02:00
Ulf Gebhardt	cca020b6b3	aligned backend and frontend queries, show last message and unread count in room list	2023-07-18 11:14:06 +02:00
Ulf Gebhardt	33ecc4764e	linting	2023-07-18 10:54:27 +02:00
Ulf Gebhardt	d7aba44fbe	removed console log and fixed reloading of messages	2023-07-18 10:48:42 +02:00
Ulf Gebhardt	98cad5b568	changed order of room to lastMessageAt	2023-07-18 10:47:56 +02:00
Ulf Gebhardt	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	0dcda35678	no console	2023-07-17 18:55:36 +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
Ulf Gebhardt	94bb798d72	Merge branch 'master' into chat-notifications	2023-07-17 15:51:52 +02:00
Ulf Gebhardt	19e441b449	more changeset reduction	2023-07-17 15:06:37 +02:00
Ulf Gebhardt	4a9199229b	redurce changeset	2023-07-17 15:05:51 +02:00
Ulf Gebhardt	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
Ulf Gebhardt	ced4996f47	implement chatMessageAdded subscription	2023-07-17 14:55:57 +02:00
mahula	58e25e6361	Merge branch 'master' into chat-order-by-indexid	2023-07-17 13:36:52 +02:00
mahula	28596b2db3	Merge branch 'master' into 6557-chat-reactive-language-switch	2023-07-17 12:58:30 +02:00
Ulf Gebhardt	3e60ab6854	room count subscription	2023-07-17 12:41:06 +02:00
Ulf Gebhardt	fb45ac107a	Merge branch 'unread-rooms-query' into chat-notifications	2023-07-17 11:49:51 +02:00
Ulf Gebhardt	ec07ddfec2	Merge branch 'master' into unread-rooms-query	2023-07-17 11:44:45 +02:00
Ulf Gebhardt	9c052ea1cd	start with chat notifications	2023-07-17 11:38:06 +02:00
Ulf Gebhardt	1e77e9aec0	Merge branch 'master' into unread-rooms-query	2023-07-17 10:23:56 +02:00
Ulf Gebhardt	9ab8fd7561	Merge branch 'master' into chat-last-seen-webapp	2023-07-17 10:10:14 +02:00
Ulf Gebhardt	121093342b	Merge branch 'master' into chat-pagniate-rooms	2023-07-17 09:30:02 +02:00
Ulf Gebhardt	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
Ulf Gebhardt	1e7f579378	adjust tests	2023-07-15 12:51:43 +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	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	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	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
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
Ulf Gebhardt	54cf5b37a5	order by indexId instead of createdAt	2023-07-14 11:09:04 +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