ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,754 Commits 117 Branches 1,511 Tags
Commit Graph

823 Commits

Author SHA1 Message Date
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
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ß
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
Markus
e1a9b5b7f7 [refactor] added new filter menu headline and adjusted some filter labels 2023-07-11 14:07:36 +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
elweyn
9715df70f8 Merge @maeckes PR in @elweyn PR. 
Co-authored-by: maeckes <markus@infinity.labs.ooo>
 2023-06-07 09:35:54 +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