5277 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	ced4996f47	implement chatMessageAdded subscription	2023-07-17 14:55:57 +02:00
Ulf Gebhardt	3e60ab6854	room count subscription	2023-07-17 12:41:06 +02:00
Ulf Gebhardt	fb45ac107a	Merge branch 'unread-rooms-query' into chat-notifications	2023-07-17 11:49:51 +02:00
Ulf Gebhardt	ec07ddfec2	Merge branch 'master' into unread-rooms-query	2023-07-17 11:44:45 +02:00
Ulf Gebhardt	9c052ea1cd	start with chat notifications	2023-07-17 11:38:06 +02:00
Ulf Gebhardt	1e77e9aec0	Merge branch 'master' into unread-rooms-query	2023-07-17 10:23:56 +02:00
Ulf Gebhardt	9ab8fd7561	Merge branch 'master' into chat-last-seen-webapp	2023-07-17 10:10:14 +02:00
Ulf Gebhardt	121093342b	Merge branch 'master' into chat-pagniate-rooms	2023-07-17 09:30:02 +02:00
elweyn	5dfdcc9bc2	fix(webapp): show room header images.	2023-07-15 19:00:46 +02:00
Ulf Gebhardt	1e7f579378	adjust tests	2023-07-15 12:51:43 +02:00
Ulf Gebhardt	775a3ddb72	strip datetime down to date in message	2023-07-15 12:35:44 +02:00
Ulf Gebhardt	2d3483dc1b	query additional data for messages	2023-07-15 12:35:26 +02:00
Ulf Gebhardt	ab91413bf3	typo	2023-07-15 10:43:08 +02:00
Ulf Gebhardt	0cb45cd8f6	removed refetch message method	2023-07-15 10:42:10 +02:00
Ulf Gebhardt	851dd2e3e6	lint fixes	2023-07-15 10:40:18 +02:00
Ulf Gebhardt	f05a0bc544	frontend paginate rooms	2023-07-15 10:38:19 +02:00
Moriz Wahl	c46d0064fc	unread rooms query in chat notification	2023-07-14 14:50:43 +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
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