5447 Commits

Author	SHA1	Message	Date
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
Markus	e33091b814	fix linting	2023-07-11 14:36:24 +02:00
Markus	a1b6576162	[refactor] adjusted label texts for filter menu	2023-07-11 14:26:45 +02:00
Markus	e81254e531	[refactor] changed button layout in filter menu	2023-07-11 14:26:19 +02:00
Markus	7c56ad9728	[refactor] removed hr in categories filter component	2023-07-11 14:10:39 +02:00
Markus	e1a9b5b7f7	[refactor] added new filter menu headline and adjusted some filter labels	2023-07-11 14:07:36 +02:00
Markus	0493a2c6c0	[refactor] changed filter layout in filter menu	2023-07-11 14:06:29 +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
mahula	98076064d5	fix typo in webapp locale	2023-07-10 12:38:49 +02:00
Ulf Gebhardt	8859aa56a4	lint fixes	2023-07-10 12:00:11 +02:00
Ulf Gebhardt	c2c96ee96c	frontend rooms query, singleRoom gets an userid now, not a boolean	2023-07-10 11:53:00 +02:00
Wolfgang Huß	f89f821dc4	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6436-show-the-event-on-the-map	2023-07-10 11:20:25 +02:00
Markus	13b2968c28	added more base design to chat component & lint	2023-07-10 10:49:48 +02:00
Markus	59828c25d2	[feature] added basic custom styling for chat	2023-07-08 16:29:22 +02:00
Markus	ee359309d9	[feature] added i18n for chat component	2023-07-08 16:12:16 +02:00
Ulf Gebhardt	50312c9106	lint	2023-07-07 08:44:35 +02:00
Ulf Gebhardt	163f8cc32c	fix for e2e test - use different css class for chat notification menu	2023-07-07 08:24:21 +02:00
Ulf Gebhardt	6c6b5ec937	Merge branch 'fix-create-post-notifications' into create-a-component-chat-scaffholding	2023-07-07 07:28:45 +02:00
Ulf Gebhardt	d42bc2ea3c	fix notifications in case no previous result is present	2023-07-07 07:19:52 +02:00
Ulf Gebhardt	e9121705a4	fix createPost query to not fail due to apollo cache	2023-07-07 07:19:35 +02:00
Ulf Gebhardt	dfbc436665	lint	2023-07-06 14:04:20 +02:00