14054 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Moriz Wahl	5376e171bd	trying last message prop in room	2023-07-14 09:11:32 +02:00
Moriz Wahl	032bca1b64	add last message at, use cypher statements for roomName and avatar	2023-07-13 19:09:17 +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
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
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
Moriz Wahl	5bf933887c	messages created by current user are not set to seen	2023-07-13 11:51:38 +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
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
Wolfgang Huß	34bb207e8e	Change store commits into 'mapMutations' on user profile	2023-07-13 09:30:19 +02:00
Wolfgang Huß	40774b0498	Put user name in the tooltip of the chat button on the user profile	2023-07-13 08:59:51 +02:00
Wolfgang Huß	f0826e6e44	Update webapp/locales/de.json ... Co-authored-by: Alexander Friedland <fridolin@tutanota.com>	2023-07-13 08:49:34 +02:00
Wolfgang Huß	afcb2a1eed	Update webapp/locales/en.json ... Co-authored-by: Alexander Friedland <fridolin@tutanota.com>	2023-07-13 08:49:19 +02:00
Wolfgang Huß	a07a8b35e0	Update webapp/pages/profile/_id/_slug.vue ... Co-authored-by: Alexander Friedland <fridolin@tutanota.com>	2023-07-13 08:49:08 +02:00
Wolfgang Huß	2a44b18aa6	Fix icon and set texts on chat button on user profile	2023-07-12 16:11:58 +02:00
Wolfgang Huß	0eaa4059b3	Fix icon and dummy count for chat notification button in header menu	2023-07-12 16:07:33 +02:00
Wolfgang Huß	181207a90b	Move chat notification button in header to position between language and system notification ... - Add this button to mobile as well.	2023-07-12 14:28:04 +02:00
Markus	b2976f06eb	updated style for chat component	2023-07-12 12:34:12 +02:00
Moriz Wahl	9f1f028454	handle seen prop	2023-07-12 11:53:49 +02:00
Wolfgang Huß	a5cb81ceac	Change group marker from blue to red on map	2023-07-12 11:24:12 +02:00
Wolfgang Huß	c51ded7b73	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map	2023-07-12 11:17:20 +02:00
Moriz Wahl	2ea77b784d	add saved, distributed and seen props. Handle distributed	2023-07-12 11:01:17 +02:00
mahula	7a4ca7011c	improve e2e test report name	2023-07-12 10:55:28 +02:00
mahula	f073553621	Revert "make e2e tests failto test html reporting" ... This reverts commit 463d2224be3f408755e2f04505ecbd63df315604.	2023-07-12 10:50:58 +02:00
mahula	c32be11561	add action to retrieve current pr number to e2e test workflow	2023-07-12 10:27:12 +02:00
Markus	c51f7afd9a	fixed syntax error in default layout	2023-07-12 10:15:25 +02:00
Markus	4ba65852a6	Merge branch '6400-change-chat-style-and-lang' of github.com:Ocelot-Social-Community/Ocelot-Social into 6400-change-chat-style-and-lang	2023-07-12 10:12:33 +02:00
Markus	64e732855b	Merge branch 'master' into 6400-change-chat-style-and-lang	2023-07-12 10:11:58 +02:00
mahula	463d2224be	make e2e tests failto test html reporting	2023-07-12 10:00:35 +02:00
Markus	db0cf69670	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-12 09:39:38 +02:00
Markus	44be837846	Merge branch '6400-change-chat-style-and-lang' of github.com:Ocelot-Social-Community/Ocelot-Social into 6400-change-chat-style-and-lang	2023-07-12 09:39:07 +02:00
Markus	86bd4bad5b	fixed intends for token style file	2023-07-12 09:38:31 +02:00
mahula	875dfcefa5	reset e2e test workflow	2023-07-12 09:28:51 +02:00
mahula	f454ea1159	reset e2e test workflow	2023-07-12 09:10:00 +02:00
mahula	4c565e92c5	correct spec pattern path in cypress config	2023-07-12 09:05:41 +02:00
mahula	a93500488a	update github e2e workflow file to reporting related changes	2023-07-12 08:35:39 +02:00