5260 Commits

Author	SHA1	Message	Date
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	db7c8d55e5	Merge branch 'master' into 6537-chat-remove-reply-smileys	2023-07-13 19:16:27 +02:00
Hannes Heine	4e6b927452	Merge branch 'master' into 6536-chat-remove-message-actions	2023-07-13 15:17:58 +02:00
Hannes Heine	dc83dd06d4	Merge branch 'master' into 6400-change-chat-style-and-lang	2023-07-13 12:19:10 +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	1648b25516	lint fixes	2023-07-13 11:06:29 +02:00
Markus	fcfd58cedf	merged master	2023-07-13 11:05:36 +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ß	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
Ulf Gebhardt	730e15a9ea	working message pagination	2023-07-12 13:15:19 +02:00
Ulf Gebhardt	635d3a2232	new room query	2023-07-12 13:15:06 +02:00
Ulf Gebhardt	7e77bc82fb	new query including index & first, offset and orderBy	2023-07-12 13:14:43 +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	64e732855b	Merge branch 'master' into 6400-change-chat-style-and-lang	2023-07-12 10:11:58 +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	e2da08c0ff	Merge branch 'master' into 6501-featurefrontend-event-creation-page	2023-07-11 15:59:33 +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
Ulf Gebhardt	1a3f11ac1f	lint locales	2023-07-11 13:23:32 +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
Markus	fade2eed21	[feature] added close button to the single room chat window	2023-07-11 10:23:44 +02:00
Markus	33f5746220	merged master	2023-07-11 10:19:17 +02:00
Wolfgang Huß	7fa970ad1a	Add event to map legend	2023-07-11 09:43:11 +02:00
Ulf Gebhardt	cb8db68b5b	user mapgetters instead of addressing the store directly	2023-07-10 17:11:14 +02:00
Ulf Gebhardt	0ad59d9412	lint fix	2023-07-10 16:27:36 +02:00
mahula	97d883b845	set new placeholder texts for venue and city inputs	2023-07-10 16:25:53 +02:00
Ulf Gebhardt	aecc24e374	chat message capability	2023-07-10 16:21:39 +02:00
Ulf Gebhardt	88e2091804	fix comments	2023-07-10 13:37:42 +02:00