629 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	5051640435	Merge branch 'master' into 6610-change-general-search-hint	2023-07-20 16:21:31 +02:00
Wolfgang Huß	999255b2b5	Change general search hint	2023-07-20 12:38:43 +02:00
Wolfgang Huß	20e6fb5122	Change headline for search user for new chat on chat page	2023-07-19 17:59:20 +02:00
Wolfgang Huß	96f8f7efda	Merge branch 'master' into 6591-chat-room-list-search-bar-placeholder	2023-07-18 14:13:51 +02:00
Wolfgang Huß	1cc60cd154	Change text for chat room search to 'Filter chat rooms'	2023-07-18 12:23:09 +02:00
Wolfgang Huß	53a320fb9d	Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6545-add-headline-to-chat-page ... # Conflicts: # webapp/locales/de.json # webapp/locales/en.json	2023-07-14 11:40:24 +02:00
Hannes Heine	dc83dd06d4	Merge branch 'master' into 6400-change-chat-style-and-lang	2023-07-13 12:19:10 +02:00
Wolfgang Huß	751c8b60a6	Add headline to chat page	2023-07-13 12:02:53 +02:00
Markus	fcfd58cedf	merged master	2023-07-13 11:05:36 +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ß	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ß	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ß	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	64e732855b	Merge branch 'master' into 6400-change-chat-style-and-lang	2023-07-12 10:11:58 +02:00
Ulf Gebhardt	1a3f11ac1f	lint locales	2023-07-11 13:23:32 +02:00
Wolfgang Huß	7fa970ad1a	Add event to map legend	2023-07-11 09:43:11 +02:00
mahula	97d883b845	set new placeholder texts for venue and city inputs	2023-07-10 16:25:53 +02:00
mahula	98076064d5	fix typo in webapp locale	2023-07-10 12:38:49 +02:00
Markus	ee359309d9	[feature] added i18n for chat component	2023-07-08 16:12:16 +02:00
Ulf Gebhardt	76c08bfa77	fix locales	2023-07-06 13:50:53 +02:00
ogerly	c8af90f0a6	add chat base-button in header menu	2023-07-05 15:51:55 +02:00
Wolfgang Huß	45f3ec743e	Remove on locale 'eventIsOnline' part '… event' to have just 'Online'	2023-06-08 16:28:22 +02:00
Wolfgang Huß	9ee47c1362	Fulfill Mogges suggestions ... Co-Authored-By: Mogge <moriz.wahl@gmx.de>	2023-06-07 20:10:10 +02:00
elweyn	107a9491ca	Correct some locales.	2023-06-07 16:47:30 +02:00
elweyn	4e43b77da2	Add custom error messages for events. ... Co-authored-by: maeckes <markus@infinity.labs.ooo>	2023-06-07 12:55:21 +02:00
Hannes Heine	3cd55051f7	Merge branch 'master' into 6339-bug-webapp-event-update-page	2023-06-05 21:20:34 +02:00
elweyn	1c344c4dfd	Fix sorting in locales.	2023-06-05 19:24:24 +02:00
elweyn	734891e93d	Fix localization of edit events ... Co-authored-by: ogerly <fridolin@tutanota.com>	2023-06-05 17:54:37 +02:00
Wolfgang Huß	fab85aea78	Implement showing of only ended events on newsfeed	2023-05-31 18:31:27 +02:00
Wolfgang Huß	152e18e650	Add separate filter buttons for articles and events	2023-05-31 15:06:52 +02:00
Wolfgang Huß	4b4c3c91ff	Implement order by start date for events	2023-05-30 17:08:23 +02:00
Wolfgang Huß	b08bacb7e0	Add title 'Creation date' to 'OrderByFilter.vue'	2023-05-30 12:36:49 +02:00
Wolfgang Huß	a3c3b02729	Fix filter button and post type filter menu labels	2023-05-26 19:21:17 +02:00
ogerly	e0b93ae796	Merge remote-tracking branch 'origin/fix-category-filter-buttons' into merge-all-events	2023-04-26 09:00:47 +02:00
ogerly	2c5576f8a1	fix lint, fix locales	2023-04-25 22:11:25 +02:00
ogerly	fad1ab212e	locales, style, events	2023-04-25 22:03:05 +02:00
Moriz Wahl	fa4ecaa3f6	filter by post type	2023-04-25 22:02:44 +02:00
ogerly	c930dd6d52	last step construct	2023-04-25 18:45:23 +02:00
ogerly	ed6717a907	locales fix	2023-04-24 15:08:09 +02:00
ogerly	d2fec8ea2f	first step for events	2023-04-05 10:24:58 +02:00
Wolfgang Huß	26b90fce47	Add tooltip to locale switch menu	2023-03-23 08:21:46 +01:00
Wolfgang Huß	28505a5b18	Add tooltip to header notifications menu	2023-03-23 08:11:30 +01:00
Wolfgang Huß	f542ab3052	Change text of invite friends header menu button	2023-03-23 08:00:51 +01:00
Wolfgang Huß	1a1561ce14	Fix locale identifier from 'avatarMenu.Groups' to 'avatarMenu.groups'	2023-03-23 07:55:10 +01:00
Wolfgang Huß	4c0469f61a	Add tooltip to header avatar menu ... - Add 'showProfileNameTitle' to profile avatar.	2023-03-23 07:51:19 +01:00
Moriz Wahl	b969630e6e	Merge branch 'master' into notifications-remove-user-from-group	2023-03-17 13:31:03 +01:00
Moriz Wahl	0c4a6ca5c7	add group description to notifications	2023-03-17 11:42:23 +01:00
Moriz Wahl	c18617fc22	group description in notification	2023-03-17 11:37:19 +01:00