14007 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
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
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	eeaa166f73	Merge pull request #6527 from Ocelot-Social-Community/disable-cypress-retries ... refactor(other): disable cypress test retries	2023-07-11 17:26:27 +02:00
mahula	7add9f4a4f	Merge branch 'master' into disable-cypress-retries	2023-07-11 16:56:40 +02:00
mahula	4a0427e02b	Merge pull request #6525 from Ocelot-Social-Community/6501-featurefrontend-event-creation-page ... feat(webapp): event creation page -better placeholder texts for venue and city inputs	2023-07-11 16:56:21 +02:00
mahula	e2da08c0ff	Merge branch 'master' into 6501-featurefrontend-event-creation-page	2023-07-11 15:59:33 +02:00
mahula	0154f7bcd5	Merge pull request #6526 from Ocelot-Social-Community/refactor-webapp-workflow ... refactor(other): refine webapp github workflow conditions	2023-07-11 15:58:57 +02:00
mahula	8d962c738a	Merge branch 'master' into refactor-webapp-workflow	2023-07-11 15:34:45 +02:00
Wolfgang Huß	a97d65da3c	Merge pull request #6532 from Ocelot-Social-Community/docu-deployment-js-files ... docs(other): update TODO-next-update.md for 2.7.0-470	2023-07-11 14:59:31 +02:00
Markus	89caf7b678	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social	2023-07-11 13:43:41 +02:00
Ulf Gebhardt	453ffa4f2b	Merge branch 'master' into docu-deployment-js-files	2023-07-11 13:29:48 +02:00
Ulf Gebhardt	ab5b7a0b8a	Merge pull request #6530 from Ocelot-Social-Community/fix-backend-room-with-self ... fix(backend): chat - do not allow to create room with self	2023-07-11 13:29:35 +02:00
Wolfgang Huß	2ffe3a2fd4	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map	2023-07-11 13:27:36 +02:00
Wolfgang Huß	c3912304f4	Fix formating	2023-07-11 13:24:55 +02:00
Ulf Gebhardt	1a3f11ac1f	lint locales	2023-07-11 13:23:32 +02:00
Wolfgang Huß	737a8f4380	Revert "Try to filter only for events with location" ... This reverts commit f247e6bd7b7554442493b799780186b916890043.	2023-07-11 13:20:38 +02:00
Wolfgang Huß	a427b21948	Renew submodule 'stage.ocelot.social'	2023-07-11 13:19:35 +02:00
Ulf Gebhardt	40dea17360	update TODO-next-update.md for 2.7.0-470	2023-07-11 13:05:01 +02:00
Ulf Gebhardt	a4bb523cb4	unit test for error when creating room with self	2023-07-11 12:57:37 +02:00
Wolfgang Huß	f217c1d63c	Replace properties.about by properties.description on map	2023-07-11 12:22:07 +02:00
Wolfgang Huß	11afa1f6d5	Simplify the map legend	2023-07-11 12:14:21 +02:00
Ulf Gebhardt	dd4e6bf2dc	fix open chat functionality after relog co-authored-by: Ogerly <https://github.com/ogerly>	2023-07-11 12:13:46 +02:00
Markus	c99bbe3708	fixed linting	2023-07-11 11:41:52 +02:00
Markus	8551cbd896	[design] adjusted single room chat window style/layout	2023-07-11 11:37:33 +02:00
Wolfgang Huß	6c32eb918d	Add markers for events to map	2023-07-11 11:33:24 +02:00
Markus	91b2961562	[feature] adjusted avatar style for chat if no image is available	2023-07-11 11:31:00 +02:00
Ulf Gebhardt	073adbe48c	do not allow to create room with self	2023-07-11 11:19:01 +02:00
Markus	fade2eed21	[feature] added close button to the single room chat window	2023-07-11 10:23:44 +02:00