5005 Commits

Author SHA1 Message Date
ogerly
a2561bde89 member management first step 2022-09-12 13:16:55 +02:00
Wolfgang Huß
c6b9cfac67 Implement group members count on group profile
- Rename 'Hc*' components to '*'.
2022-09-12 11:56:00 +02:00
Wolfgang Huß
621b1a0ba0 Implement members list on group profile 2022-09-12 09:44:23 +02:00
Wolfgang Huß
8e1355e5ee Change 'titleNobody' in component 'ProfileList' to not(!) required 2022-09-12 09:42:03 +02:00
Wolfgang Huß
9e544b0e64 Rename props and classes in 'ProfileList' 2022-09-12 08:35:52 +02:00
Wolfgang Huß
b7be7018e8 Move important parts of 'FollowList' to sub component 'ProfileList' 2022-09-12 08:26:10 +02:00
Wolfgang Huß
a9376cb979 Renamed folder 'FollowList' to 'ProfileList' 2022-09-12 07:32:18 +02:00
Wolfgang Huß
ee026a3e15 Remove unused parameters in 'GroupMembers' query 2022-09-10 13:16:34 +02:00
Wolfgang Huß
1796a04a9c
Update webapp/components/Group/GroupForm.vue 2022-09-10 08:57:06 +02:00
Wolfgang Huß
c155555ba2 Fix locales 2022-09-10 08:55:24 +02:00
Wolfgang Huß
5eabdf1495 Comment out unimplemented parameters in 'Group' resolver 2022-09-10 07:46:08 +02:00
Wolfgang Huß
af26b8605c Show page not found error if there is no 'id' and no 'slug' in a persistent link 2022-09-09 13:49:16 +02:00
Wolfgang Huß
36f6fee8be Query groups by 'Group' resolver via 'slug' and test it 2022-09-09 13:44:13 +02:00
ogerly
26cf8f14d9 resolve conflicts 2022-09-09 13:18:46 +02:00
ogerly
80940ae4f5 fix lint 2022-09-09 13:06:46 +02:00
ogerly
a1da04ec05 change components add constants 2022-09-09 13:06:13 +02:00
Alexander Friedland
7cb965e9ad
Update webapp/pages/group/edit/_id.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-09 13:04:26 +02:00
Alexander Friedland
62f57681eb
Update webapp/pages/group/edit/_id.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-09 13:04:15 +02:00
Alexander Friedland
ad029247e7
Update webapp/components/Group/GroupForm.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-09 13:03:38 +02:00
ogerly
a5d5dd7eda import GroupMembers component in group settings 2022-09-09 12:23:51 +02:00
Alexander Friedland
07b3857e4b
Update webapp/pages/group/edit/_id/index.vue
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-09 12:18:57 +02:00
ogerly
3d5f29c0f1 change page structure for groupe settings 2022-09-09 12:17:48 +02:00
Alexander Friedland
ca8047138e
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-09 11:31:08 +02:00
Alexander Friedland
b312ce49a5
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-09 11:31:00 +02:00
Alexander Friedland
a32a2d03be
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-09 11:30:48 +02:00
ogerly
109a5f5aa4 fix lint 2022-09-09 11:11:15 +02:00
ogerly
362aae3c5b add router in group settings 2022-09-09 11:10:11 +02:00
ogerly
46f981357f fix lint 2022-09-09 10:19:24 +02:00
ogerly
a9a2097557 Merge branch '5059-epic-groups' into 5140-My-Groups-Page 2022-09-09 10:14:46 +02:00
ogerly
e5a969b3f7 group settings add sidemenu 2022-09-08 17:05:16 +02:00
Moriz Wahl
bb0d6329e7 add new yunite icons 2022-09-08 16:25:18 +02:00
Moriz Wahl
60627ffcf2 ensure that selected categories are resteted before toggling them to set saved categories 2022-09-08 15:34:29 +02:00
Moriz Wahl
2c4f45ad70
Update webapp/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-08 15:17:12 +02:00
Moriz Wahl
cc5fcb6704
Update webapp/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-09-08 15:17:05 +02:00
Wolfgang Huß
89920f387a Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups
# Conflicts:
#	backend/src/schema/types/type/User.gql
2022-09-08 13:29:29 +02:00
ogerly
571e8fbddc resolve conflicts 2 2022-09-08 12:20:28 +02:00
ogerly
f6de01e821 resolve conflicts 2022-09-08 12:11:50 +02:00
ogerly
fb9cf7559e fix updateGroup function 2022-09-08 11:59:54 +02:00
ogerly
fe6ad2cff3 add better seed for group myRole 2022-09-08 09:55:58 +02:00
ogerly
99d2ce9d29 update group data funktion 2022-09-08 08:35:29 +02:00
Moriz Wahl
754251258d test setting of saved categories 2022-09-07 21:50:37 +02:00
Moriz Wahl
b323d0f580 set category filter as stored in db after login 2022-09-07 20:19:10 +02:00
Moriz Wahl
32e7c8971c Merge branch 'master' into save-categories-in-frontend 2022-09-07 15:14:03 +02:00
Moriz Wahl
5596cd11e9 test saving active categories 2022-09-07 15:13:14 +02:00
Moriz Wahl
d05919fddb add active categories to current user query 2022-09-07 14:08:03 +02:00
Moriz Wahl
341e386207 linting 2022-09-07 13:37:48 +02:00
Wolfgang Huß
99b1a164a8 Remove testing of group profile for now 2022-09-07 12:29:17 +02:00
Wolfgang Huß
ee770aa204 Cleanup 2022-09-07 12:25:08 +02:00
Wolfgang Huß
fa79c25e9b Implement join button on Group profile, a start 2022-09-07 11:12:34 +02:00
Moriz Wahl
f5d8014f6c fix: Category Filter Menu Client Only 2022-09-07 11:06:43 +02:00