839 Commits

Author SHA1 Message Date
Moriz Wahl
45737977d5 normalize all locale files 2024-03-05 16:59:27 +01:00
Moriz Wahl
6161ae2853 normalize spanish locale 2024-03-05 16:50:23 +01:00
Hannes Heine
563bdeb9be
Merge branch 'master' into LarsE11-changed-placeholder-field-for-event-location 2024-03-04 09:48:07 +01:00
Wolfgang Huß
9d9b325d43 Add 'Map' entry to user menu 2024-01-24 15:05:01 +01:00
Wolfgang Huß
3afa99e116 Change menu tool tip 'Show map' to 'Map' and rename identifier from 'map.button.tooltip' to 'header.map.tooltip' 2024-01-24 14:55:02 +01:00
Wolfgang Huß
c90d5b7edb Change menu tool tip 'Show groups' to 'Groups' and rename identifier from 'group.button.tooltip' to 'header.groups.tooltip' 2024-01-24 14:50:52 +01:00
Wolfgang Huß
47305320d6 Change menu tooltip 'My notifications' to 'Notifications' and rename identifier from 'notifications.headerMenuButton.tooltip' to 'header.notifications.tooltip' 2024-01-24 14:32:03 +01:00
Wolfgang Huß
51e663e0a6 Change menu tooltip 'My chats' to 'Chats' and rename identifier from 'header.chat.tooltip' to 'header.chats.tooltip' 2024-01-24 13:54:57 +01:00
Wolfgang Huß
b4533a54f6 Change user menu entry 'Notifications' of Polish, Netherlands and Italian to 'All notifications' 2024-01-24 13:34:37 +01:00
Wolfgang Huß
507ca96429 Revert partly "Auxiliary commit to revert individual files from 73d66e261e37bab55b17556c666169821c5f9cf5"
This reverts commit 4770032556f76f392592c09a9cde37f32bf79b14.
2024-01-24 13:28:59 +01:00
Wolfgang Huß
4090a8b6b3 Split locales entry 'notifications.pageLink' by adding a 'header.avatarMenu.notifications' entry to have them seperated 2024-01-24 13:25:56 +01:00
Wolfgang Huß
6f4c6c2fd6 Add 'Chats' entry to user menu 2024-01-24 12:18:01 +01:00
Wolfgang Huß
73d66e261e Change user menu entry 'All notifications' to 'Notifications' 2024-01-24 11:58:25 +01:00
elweyn
08821d2b9e Add a 'click on next' text. 2023-11-21 10:18:28 +01:00
LarsE11
e7d6639bcd
Update en.json
- changes placeholder fields for events
2023-10-17 10:11:23 +02:00
LarsE11
8b5fb3658e
Update de.json
- changed placeholder field for event location
2023-10-17 09:51:12 +02:00
mahula
d57ff2d4ef set back notification text 2023-08-02 12:52:39 +02:00
Wolfgang Huß
002d4737aa
Merge branch 'master' into fix-missing-locales 2023-08-02 12:17:29 +02:00
Wolfgang Huß
359101bb4c Fix wrong labels in filter menu buttons 2023-08-02 11:36:40 +02:00
mahula
60c927612b
Merge branch 'master' into fix-missing-locales 2023-08-02 10:31:24 +02:00
elweyn
f5171d598f fix(webapp): add missing locales. 2023-07-31 10:53:40 +02:00
Markus
44656c7aba Merge branch 'master' into 6500-refactor-filter-menu 2023-07-28 14:08:37 +02:00
Wolfgang Huß
5696d374e5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6500-refactor-filter-menu 2023-07-26 14:58:41 +02:00
Wolfgang Huß
0e948fc2e3 Change filter menu save button label to 'Save topics' 2023-07-26 14:58:30 +02:00
Wolfgang Huß
7443c60d40 Fix create event typing issues 2023-07-26 14:10:15 +02:00
Hannes Heine
7f06d71f6a
Merge branch 'master' into 6443-refactor-create-post-page 2023-07-26 10:53:04 +02:00
Hannes Heine
fa569a7172
Merge branch 'master' into 6500-refactor-filter-menu 2023-07-24 07:44:16 +02:00
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ß
858e3fdee8 Rename 'addRoom' to 'toggleUserSearch' in chat component 2023-07-20 10:40:04 +02:00
Markus
a8f32cad75 Merge branch 'master' into 6443-refactor-create-post-page 2023-07-19 22:01:47 +02:00
Markus
b190c56b52 Merge branch 'master' into 6500-refactor-filter-menu 2023-07-19 21:57:46 +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
Markus
9662e729aa Merge branch 'master' into 6443-refactor-create-post-page 2023-07-13 18:50:04 +02:00
Markus
caa7e8e1fb [refactor] updated ui of creat post page 2023-07-13 18:47:36 +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ß
afcb2a1eed
Update webapp/locales/en.json
Co-authored-by: Alexander Friedland <fridolin@tutanota.com>
2023-07-13 08:49:19 +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
Markus
a1b6576162 [refactor] adjusted label texts for filter menu 2023-07-11 14:26:45 +02:00