16408 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	9662e729aa	Merge branch 'master' into 6443-refactor-create-post-page	2023-07-13 18:50:04 +02:00
Markus	82bda3ffa5	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-13 18:49:48 +02:00
Markus	caa7e8e1fb	[refactor] updated ui of creat post page	2023-07-13 18:47:36 +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
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 b2.7.0-481	2023-07-13 15:09:11 +02:00
Markus	08b78aad7c	fixed linting	2023-07-13 14:45:44 +02:00
Markus	24c6884b9a	[feature] changed usertag in chat messages to user-slug	2023-07-13 14:38:28 +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 b2.7.0-480	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() b2.7.0-479	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 b2.7.0-478	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 b2.7.0-477	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
Wolfgang Huß	751c8b60a6	Add headline to chat page	2023-07-13 12:02:53 +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