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,446 Commits 5 Branches 2 Tags
Commit Graph

1873 Commits

Author SHA1 Message Date
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ß
1796a04a9c
Update webapp/components/Group/GroupForm.vue 2022-09-10 08:57:06 +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
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
ogerly
3d5f29c0f1 change page structure for groupe settings 2022-09-09 12:17:48 +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
60627ffcf2 ensure that selected categories are resteted before toggling them to set saved categories 2022-09-08 15:34:29 +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
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
f5d8014f6c fix: Category Filter Menu Client Only 2022-09-07 11:06:43 +02:00
Moriz Wahl
3213bd3ee4 test save categories 2022-09-06 19:17:06 +02:00
Moriz Wahl
d45ad17b43 add save button to category filters 2022-09-06 18:51:20 +02:00
Moriz Wahl
60fabe587b
Merge pull request #5248 from Ocelot-Social-Community/create-topics-menu 
feat: Topics Menu
 2022-09-06 13:28:15 +02:00
Wolfgang Huß
9b83b37ea3 Upload group avatar on group profile page 2022-09-06 09:14:28 +02:00
ogerly
5f7b1c9094 new group mutation with correct data 2022-09-05 13:26:00 +02:00
ogerly
9715243454 Merge branch '5059-epic-groups' into 5140-My-Groups-Page 2022-09-05 11:18:57 +02:00
ogerly
bfe6605b21 list upgrade database datas 2022-09-05 11:17:31 +02:00
Wolfgang Huß
b96dfa84e0 Merge branch '5059-groups/5131-implement-update-group-resolver' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 
# Conflicts:
#	backend/src/schema/resolvers/groups.spec.js
 2022-09-05 10:59:21 +02:00
Moriz Wahl
87aa47d683 add optional topica menu when categories are active 2022-08-31 14:32:46 +02:00
Wolfgang Huß
99f053205a
Merge pull request #5198 from Ocelot-Social-Community/categories-filter-menu 
feat: Categories Filter Menu
 2022-08-31 08:44:56 +02:00
Wolfgang Huß
5f43a51c6a Rename prop 'user' of 'profile-avatar' to 'profile' 2022-08-29 18:39:51 +02:00
Wolfgang Huß
615ee2991a Rename Component from 'UserAvatar' as 'user-avatar' to 'ProfileAvatar' as 'profile-avatar' 2022-08-29 18:21:50 +02:00
Wolfgang Huß
077a63aca7 Rename class 'user-avatar' to 'profile-avatar' 2022-08-29 18:09:51 +02:00
Wolfgang Huß
a9c52bfcae Renamed 'AvatarUploader' property from 'user' to 'profile' 
- Rename several CSS.
 2022-08-29 13:03:43 +02:00
Wolfgang Huß
ac0aacf776 Rename 'hc-upload' or 'Upload' to AvatarUploader and moved 'ImageUploader' to folder 'Uploader' 2022-08-29 12:10:23 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00
Wolfgang Huß
d8d080dae5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into categories-filter-menu 2022-08-25 17:39:38 +02:00
Moriz Wahl
407f4f8d2d fix test (mock .CATEGORIES_ACTIVE) 2022-08-25 13:29:08 +02:00
Tima Gixe
15ce070288 Update tests to expect Not Authorized! 2022-08-25 09:08:14 +03:00
Moriz Wahl
a22023174d feat: Show Categories Filter when Categories are Active 2022-08-22 18:33:12 +02:00
ogerly
936ecf2477 add mutation createGroup and query GroupList 2022-08-15 15:35:33 +02:00
ogerly
c2a769f325 add CategoriesSelect in GroupForm.vue 2022-08-14 12:49:15 +02:00
ogerly
46d26a0ef8 add graphql groups, add createGroup mutation 2022-08-14 11:45:33 +02:00
ogerly
addfc39c4c add groupe site id und slug 2022-08-11 11:10:52 +02:00
ogerly
d50ae27e49 prework for group list 2022-08-10 09:07:32 +02:00
ogerly
25a64a0c3c prework for group form 2022-08-07 21:37:19 +02:00
ogerly
f1831661e5 add my-groups page and setting link 2022-08-07 14:12:17 +02:00
ogerly
fd36da604f Merge branch 'make-categories-optional' into 5140-My-Groups-Page 2022-08-03 10:38:01 +02:00
ogerly
cf31f3c1d6 preparation for creating a new group 2022-08-03 10:26:08 +02:00