IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-01-20 03:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,083 Commits 5 Branches 2 Tags
Commit Graph

13083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
572377acfd add active categories to user 2022-09-05 20:06:10 +02:00
Moriz Wahl
b8ac4cc3ca add saveCategoruSettings mutation to schema 2022-09-05 17:41:21 +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
Wolfgang Huß
685ef85752 Test 'Group' with 'categories' as result 
- Cleanup.
 2022-09-05 09:30:35 +02:00
Wolfgang Huß
5f081cdb0d Refine test descriptions for groups 
- Cleanup.
 2022-09-05 09:19:07 +02:00
Wolfgang Huß
92e6cc3f1b Cleanup 2022-09-05 09:13:47 +02:00
Wolfgang Huß
e713f65522 Refine groups testing 2022-09-05 09:01:42 +02:00
Wolfgang Huß
bfc60bcbf0 Test 'UpdateGroup' with 'categoryIds', remainders 2022-09-02 08:13:53 +02:00
Wolfgang Huß
999bbd85c1 Add more slugification tests for 'CreateGroup' and 'UpdateGroup' 2022-09-02 08:11:40 +02:00
Wolfgang Huß
7ec6086915 Test 'UpdateGroup' in general resolver and 'Group' resolver with 'id' 2022-09-02 08:10:46 +02:00
Wolfgang Huß
b82dcd45aa Add a missing await in 'posts.spec.js' 2022-09-02 05:35:52 +02:00
Wolfgang Huß
da66aa4852 Test 'UpdateGroup' resolver, a start 2022-09-01 15:33:28 +02:00
Wolfgang Huß
b80a9fdff8
Merge pull request #5253 from Ocelot-Social-Community/5252-doc-graphql-playground 
docs: 🍰 Document GraqhQL Playground
 2022-09-01 15:06:19 +02:00
Wolfgang Huß
4f7ce5a6c1 Fix slugification tests of 'UpdateGroup' 2022-09-01 15:04:49 +02:00
Wolfgang Huß
28a742574c
Update README.md 2022-09-01 12:15:30 +02:00
Wolfgang Huß
13cd81fcf5
Update GraphQL-Playground.md 2022-09-01 12:06:28 +02:00
Wolfgang Huß
9ac943d11d
Delete GraphQL-Playground.md 2022-09-01 10:57:16 +02:00
Wolfgang Huß
1f6beffa6f
Create GraphQL-Playground.md 2022-09-01 10:32:36 +02:00
Wolfgang Huß
85569c38da
Create GraphQL-Playground.md 2022-09-01 10:31:53 +02:00
Wolfgang Huß
44eb9d0bde Implement 'UpdateGroup' resolver, not working 2022-09-01 09:31:50 +02:00
Moriz Wahl
87aa47d683 add optional topica menu when categories are active 2022-08-31 14:32:46 +02:00
Moriz Wahl
d6f8b0dc77 change category to topic in german and english locales 2022-08-31 14:28:25 +02:00
Wolfgang Huß
a1c7ba6129 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-update-group-resolver 2022-08-31 09:23:32 +02:00
Wolfgang Huß
a5878ab505 Fix linting 2022-08-31 09:22:38 +02:00
Wolfgang Huß
2814f81ed5 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-update-group-resolver 
# Conflicts:
#	backend/src/db/graphql/groups.js
#	backend/src/middleware/permissionsMiddleware.js
 2022-08-31 09:21:08 +02:00
Wolfgang Huß
a8f59a4c42 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	backend/src/constants/categories.js
#	backend/src/db/seed.js
 2022-08-31 09:02:26 +02:00
Wolfgang Huß
422d818133 !!! Temp !!! 2022-08-31 08:51:01 +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ß
244cb590e3
Merge pull request #5199 from Ocelot-Social-Community/5059-groups/5188-query-members-of-group 
feat: 🍰 Implement `JoinGroup`, `GroupMember`, `SwitchGroupMemberRole` Resolvers
 2022-08-30 10:28:26 +02:00
Moriz Wahl
c61e983102 remove double console log 2022-08-30 10:21:15 +02:00
Moriz Wahl
0d1da0d83d
Update backend/src/db/migrate/store.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-08-30 10:14:39 +02:00
Moriz Wahl
3e6cabaa1c
Update backend/src/db/migrate/store.js 
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2022-08-30 10:13:56 +02:00
Wolfgang Huß
fa2e92a363 Refine tests in 'slugifyMiddleware.spec.js' 2022-08-30 08:25:56 +02:00
Wolfgang Huß
d969141fc6 Implement 'UpdateGroup' resolver, first step 2022-08-30 06:58:39 +02:00
Wolfgang Huß
b9e59badb0 Add avatar to group page 2022-08-30 06:27:37 +02:00
Wolfgang Huß
aa09ac29dc Fix tests 2022-08-29 19:53:59 +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ß
2fc84f9c36 Rename class 'profile-avatar' to 'profile-page-avatar' 2022-08-29 13:45:30 +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ß
d1b940b332 Implement 'groupSince' and 'groupGoal' in group profile 2022-08-29 11:50:06 +02:00
Wolfgang Huß
f678dad50a Fix linting 2022-08-29 11:32:20 +02:00
Wolfgang Huß
6280fa99cf Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 2022-08-29 11:28:50 +02:00
Wolfgang Huß
23512c6e96 Merge branch '5059-groups/5190-group-profile' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 
# Conflicts:
#	webapp/graphql/groups.js
 2022-08-29 11:28:35 +02:00
Wolfgang Huß
39487778bf Implement group profile, first step 2022-08-29 11:26:27 +02:00