ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,361 Commits 117 Branches 1,511 Tags
Commit Graph

11361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Moriz Wahl
01dd0dc038
Merge pull request #5301 from Ocelot-Social-Community/fix-category-filter-menu 
fix: Category Filter Menu Client Only
b1.1.0-222 		2022-09-07 12:57:45 +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
Moriz Wahl
1c2a2a05fe
Merge pull request #5261 from Ocelot-Social-Community/save-category-settings 
feat: Save Category Settings
b1.1.0-221 		2022-09-07 09:14:58 +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
Moriz Wahl
8a688ca78b improve tests 2022-09-06 15:14:31 +02:00
Moriz Wahl
60fabe587b
Merge pull request #5248 from Ocelot-Social-Community/create-topics-menu 
feat: Topics Menu
b1.1.0-220 		2022-09-06 13:28:15 +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
Moriz Wahl
4e5d4cb873 basic tests for save category settings 2022-09-05 20:51:48 +02:00
Moriz Wahl
fc6d544ea7 add resolver for save active categories 2022-09-05 20:07:14 +02:00
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
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
b1.1.0-219 		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
b1.1.0-218 		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