14087 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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	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	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
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
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	2023-07-13 19:15:19 +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	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
Ulf Gebhardt	da0f7094a8	Merge pull request #6520 from Ocelot-Social-Community/refactor-seed ... refactor(backend): fix seed to not use promise all where easily refactored	2023-07-13 15:09:11 +02:00
Ulf Gebhardt	7b23f753ac	Merge branch 'master' into refactor-seed	2023-07-13 14:29:43 +02:00
mahula	658a616170	Merge pull request #6540 from Ocelot-Social-Community/cypress-reporting ... refactor(other): add proper reporting to cypress tests	2023-07-13 14:27:14 +02:00
mahula	264546c27c	Merge branch 'master' into cypress-reporting	2023-07-13 14:04:14 +02:00
mahula	e3b619709c	Merge pull request #6528 from Ocelot-Social-Community/6375-refactor-cypress-migrate-from-cypress-file-upload-to-selectfile ... refactor(other): cypress - migrate from cypress-file-upload to .selectFile()	2023-07-13 13:59:14 +02:00
mahula	c9e4029b2e	Merge branch 'master' into 6375-refactor-cypress-migrate-from-cypress-file-upload-to-selectfile	2023-07-13 13:32:18 +02:00
Hannes Heine	f9afdc9bce	Merge pull request #6517 from Ocelot-Social-Community/6400-change-chat-style-and-lang ... feat(webapp): change chat style and lang	2023-07-13 13:31:15 +02:00
Ulf Gebhardt	4b9e7da1ba	typo	2023-07-13 12:30:02 +02:00
Ulf Gebhardt	a961f88cff	indexId as Int not String	2023-07-13 12:28:54 +02:00
Hannes Heine	dc83dd06d4	Merge branch 'master' into 6400-change-chat-style-and-lang	2023-07-13 12:19:10 +02:00
Hannes Heine	980681793d	Merge pull request #6518 from Ocelot-Social-Community/6436-show-the-event-on-the-map ... feat(webapp): show events with locations on the map	2023-07-13 12:18:48 +02:00
Ulf Gebhardt	06b15dcd5c	expect specific order of elements when querying, fix pagination query	2023-07-13 12:18:05 +02:00
Ulf Gebhardt	bb509ae244	remove comment, reverse order to reduce client workload	2023-07-13 12:17:28 +02:00
Moriz Wahl	5bf933887c	messages created by current user are not set to seen	2023-07-13 11:51:38 +02:00
Ulf Gebhardt	ac6bbf1840	remove setTimeout	2023-07-13 11:33:45 +02:00
Markus	cbf1bab2f2	[feature] remove reply emojis for chat component	2023-07-13 11:31:04 +02:00
Ulf Gebhardt	c21026e28a	fixed message loading state when writing and refetching	2023-07-13 11:23:06 +02:00
Markus	507be4eca2	[feature] removed message actions for chat	2023-07-13 11:15:46 +02:00
Ulf Gebhardt	a82e76f366	test message ordering & pagination	2023-07-13 11:13:06 +02:00
Ulf Gebhardt	1648b25516	lint fixes	2023-07-13 11:06:29 +02:00
Markus	fcfd58cedf	merged master	2023-07-13 11:05:36 +02:00
Markus	bcf93797f7	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-13 11:00:57 +02:00
Markus	9cca4c9e6f	[feature] changed chat style export so rebranding is also working for chat	2023-07-13 11:00:44 +02:00
Ulf Gebhardt	d513a32ea8	Merge branch 'master' into message-pagination	2023-07-13 10:56:27 +02:00
Wolfgang Huß	20d7e0690e	Merge branch 'master' into 6436-show-the-event-on-the-map	2023-07-13 10:49:30 +02:00
Wolfgang Huß	f2f003d205	Merge pull request #6550 from Ocelot-Social-Community/6542-chat-in-header ... feat(webapp): refine chat notification in header menu and chat button on user profile	2023-07-13 10:48:45 +02:00
Ulf Gebhardt	8065529d0a	reverted change - use forEach instead of for loop	2023-07-13 10:41:55 +02:00