14226 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	121093342b	Merge branch 'master' into chat-pagniate-rooms	2023-07-17 09:30:02 +02:00
mahula	6ab1d24c36	remove pr number step fpm e2e test job	2023-07-17 07:47:49 +02:00
mahula	fe8d4a4cfa	reuse pr number from preparation step in e2e test step	2023-07-17 07:46:01 +02:00
mahula	545eb04d6c	adapt step namings	2023-07-17 07:43:54 +02:00
mahula	9ba873648e	add cache restoring in e2e test step	2023-07-17 07:42:58 +02:00
mahula	690021fcb6	move cypress requirement installation to preparation step	2023-07-17 07:39:57 +02:00
mahula	5ca1e9e648	add docker image building step to e2e test workflow	2023-07-17 07:35:20 +02:00
Ulf Gebhardt	cfc34495a7	Merge branch 'master' into 6557-chat-reactive-language-switch	2023-07-17 01:01:51 +02:00
Ulf Gebhardt	ddc864a433	Merge pull request #6581 from Ocelot-Social-Community/fix-room-image ... fix(webapp): show room header images.	2023-07-17 00:55:19 +02:00
Ulf Gebhardt	c0dec2c358	Merge branch 'master' into fix-room-image	2023-07-16 20:40:50 +02:00
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	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
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	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	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