IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,477 Commits 5 Branches 2 Tags
Commit Graph

4205 Commits

Author SHA1 Message Date
Wolfgang Huß
912980c6e6 Implement 'description', 'descriptionExcerpt', and collapse on group profile 2022-09-15 18:28:13 +02:00
Wolfgang Huß
b5e181c6a1 Fix undefined locales for group properties on group profile 2022-09-15 10:05:08 +02:00
Wolfgang Huß
b23f4ea47b Implement descriptionExcerpt on group profile 2022-09-15 09:55:51 +02:00
Wolfgang Huß
12a924764c Add comments for several elements on the group profile 2022-09-15 07:49:25 +02:00
Wolfgang Huß
6af9e0cec0 Merge branch '5059-groups/5318-group-profile-second' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-members-list-etc 
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
 2022-09-14 16:18:37 +02:00
Wolfgang Huß
b7d4d506e3 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-second 2022-09-14 14:32:27 +02:00
Wolfgang Huß
2d3d559eab Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-09-14 14:28:09 +02:00
Wolfgang Huß
210aebb829 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5318-group-profile-second 2022-09-14 14:27:01 +02:00
Wolfgang Huß
ff8f3fed7a Implement confirm modal for leaving a group 2022-09-14 14:12:06 +02:00
Wolfgang Huß
13727729a5 Refactor join/leave button function and the related events 2022-09-14 13:01:07 +02:00
Wolfgang Huß
176fb3919a Fix Vue HTML errors in group profile 'groupType' etc. 2022-09-14 08:49:45 +02:00
Wolfgang Huß
bfef47a2a1 fix assignment to prop in 'JoinLeaveButton' 2022-09-14 08:28:56 +02:00
Wolfgang Huß
9472a68bcd Add Vue 'head' element to group and user profile 2022-09-13 22:49:46 +02:00
Wolfgang Huß
e04bfe7484 Implement displaying of 'myRole', 'groupType', and 'actionRadius' on group profile 2022-09-13 22:06:16 +02:00
Wolfgang Huß
0cd3617f65 Implement working leave button on group profile 2022-09-13 20:42:08 +02:00
Wolfgang Huß
6a9c040722 Implement 'LeaveGroup' resolver 2022-09-13 20:23:34 +02:00
Wolfgang Huß
13e7b1fb9c Simplify assignment to 'Group[0]' after refining things 2022-09-13 06:03:50 +02:00
Wolfgang Huß
4e845284fc Fix error that the prop 'groupId' in 'JoinLeaveButton' is undefined at the beginning 2022-09-12 20:08:04 +02:00
Wolfgang Huß
330bdd4df5 Implement join/leave button on group profile 2022-09-12 20:00:48 +02:00
Moriz Wahl
922ca2d7ef
Merge pull request #5284 from Ocelot-Social-Community/save-categories-in-frontend 
feat: 🍰 Save Categories In Frontend
 2022-09-12 15:08:09 +02:00
Wolfgang Huß
aac951e7a7 Refine profile and follow list 2022-09-12 13:23:37 +02:00
Wolfgang Huß
6f1c718d39 Fix 'uniqueName' at group members list on group profile 2022-09-12 13:20:36 +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