11371 Commits

Author SHA1 Message Date
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
Wolfgang Huß
0f9cc6864e
Merge pull request #5197 from Ocelot-Social-Community/5059-groups/5190-group-profile
feat: 🍰 Implement Group Profile
2022-09-08 10:59:51 +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
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
Wolfgang Huß
d11b512bfb Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 2022-09-07 08:32:05 +02:00
Wolfgang Huß
705ab9a0a3
Merge pull request #5224 from Ocelot-Social-Community/5059-groups/5131-implement-update-group-resolver
feat: 🍰 Implement `UpdateGroup` Resolver
2022-09-06 19:51:43 +02:00
ogerly
228a676cd5 fix locales 2022-09-06 12:20:25 +02:00
ogerly
dbb8006432 Merge branch '5059-groups/5131-implement-update-group-resolver' into 5140-My-Groups-Page 2022-09-06 12:12:08 +02:00
ogerly
74b679c2c0 Merge branch '5059-groups/5131-implement-update-group-resolver' into 5140-My-Groups-Page 2022-09-06 12:08:46 +02:00
Wolfgang Huß
b2f0c0677d Fix typo after Moriz suggestion
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
2022-09-06 10:39:56 +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
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
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