609 Commits

Author SHA1 Message Date
Moriz Wahl
fa4ecaa3f6 filter by post type 2023-04-25 22:02:44 +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
Moriz Wahl
da93e7ff83 locales for remove user from group notification 2023-03-16 16:02:17 +01:00
Moriz Wahl
ed217a0c14 locales for change group member role notification 2023-03-16 15:34:08 +01:00
Moriz Wahl
1d277e96a7 locales for left group mutation 2023-03-16 14:39:55 +01:00
Wolfgang Huß
8d98d07d22 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint 2023-03-16 13:06:04 +01:00
Moriz Wahl
60b9262d7a new locales 2023-03-15 16:35:30 +01:00
Moriz Wahl
10c02c251e group notifications in notification dropdown 2023-03-15 16:23:45 +01:00
mahula
6a66c99a7d
update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-15 12:46:10 +01:00
mahula
fe422f5c77 add leave and tooltip key tolocales 2023-03-15 11:39:03 +01:00
Wolfgang Huß
7ec6b6d39d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint 2023-03-14 07:36:15 +01:00
mahula
6eccde6cbe change locales key roles.usual 2023-03-13 13:55:08 +01:00
mahula
691fa9b744 add key pendingMember to locales 2023-03-13 13:52:47 +01:00
Wolfgang Huß
0172d5bb3b
Merge branch 'master' into 5978-refactor-change-invite-code-button-and-menu-to-copy-invite-link 2023-03-09 18:23:34 +01:00
Wolfgang Huß
fd62a03820 Add hint text to create and edit a post of a group 2023-03-09 18:06:14 +01:00
mahula
c9d6e1a9ea add tooltip to invite button 2023-03-09 15:43:58 +01:00
Wolfgang Huß
d10b8b7351
Merge branch 'master' into 6104-change-group-filter-texts 2023-03-09 14:24:48 +01:00
Moriz Wahl
5bd831752d
Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-09 13:23:09 +01:00
mahula
9a59799b2b change copy text in invite button menu 2023-03-09 13:10:57 +01:00
mahula
cf6116b5d9 change locales for invitation link short description 2023-03-09 13:02:28 +01:00
Wolfgang Huß
8e7009c149
Merge branch 'master' into 6104-change-group-filter-texts 2023-03-09 11:04:37 +01:00
Moriz Wahl
bdc1cb33da Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-08 16:50:02 +01:00
Wolfgang Huß
b28a595ae4 Change group filter button text 2023-03-08 16:22:53 +01:00
Moriz Wahl
bd11c33f91
Merge branch 'master' into remove-user-from-group 2023-03-08 16:00:19 +01:00
Moriz Wahl
1575ee9765 Ebertsche Knöpfe for filter by posts in my groups 2023-03-06 16:20:45 +01:00
Moriz Wahl
b63ade8da1 add filter posts by my groups 2023-03-06 16:05:15 +01:00
Moriz Wahl
eb0bc971ec
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2023-03-06 13:47:28 +01:00
Moriz Wahl
e384ec5ea6 message for removal og group members 2023-03-03 17:43:41 +01:00
Moriz Wahl
e0a60a91cc
Merge pull request #5950 from Ocelot-Social-Community/5948-set-legend-to-map
refactor(webapp): set legend to map
2023-02-08 16:29:51 +01:00
Moriz Wahl
e0751403a7 Sort locales 2023-02-08 12:35:45 +01:00
Alexander Friedland
3d39e4db46
Update webapp/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-08 12:24:08 +01:00
Alexander Friedland
802151c7ef
Update webapp/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-08 12:23:51 +01:00
ogerly
fc896181b3 fix locales 2023-02-08 12:12:16 +01:00
ogerly
fd9e50cd05 add legend on map 2023-02-08 12:11:53 +01:00
Moriz Wahl
549d1c6368 change filter button text 2023-02-08 12:00:26 +01:00
Moriz Wahl
60b9d577f0 Merge branch 'master' into merge-5750-in-5818 2023-02-03 22:10:57 +01:00
Alexander Friedland
31c28aa83b
Update webapp/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-03 19:20:54 +01:00
Alexander Friedland
4c282fb5fb
Update webapp/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-03 19:20:48 +01:00
Moriz Wahl
b8228db9f3 Merge branch 'master' into map 2023-02-03 17:41:12 +01:00
Wolfgang Huß
6590a8dd9f Move location hint under location select on group and settings form 2023-02-01 11:11:30 +01:00
Wolfgang Huß
5f8368e971 Add hint to labels of user and group position settings 2023-01-31 17:50:03 +01:00
Moriz Wahl
52eeb5effc Merge branch 'master' into fix-group-texts 2023-01-31 16:54:33 +01:00
Wolfgang Huß
81f2840a95 Implement alert message on map page if 'MAPBOX_TOKEN' is empty in .env 2023-01-31 15:50:27 +01:00