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
12,740 Commits 117 Branches 1,511 Tags
Commit Graph

186 Commits

Author SHA1 Message Date
Moriz Wahl
5bd831752d
Merge branch 'master' into feature/mark-all-notification-as-read 2023-03-09 13:23:09 +01:00
Moriz Wahl
db8ad8897e same cypher for removeUserFromGroup and leaveGroup, adjust tests, admin cannot remove users fro group 2023-03-06 14:11:55 +01:00
Moriz Wahl
cd3e2ee8ad test remove user from group mutation 2023-03-03 17:29:48 +01:00
Moriz Wahl
de7dded197 add permisson for removeUserFromGroup 2023-03-03 16:42:49 +01:00
Wolfgang Huß
b398eabf47 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into feature/mark-all-notification-as-read 
# Conflicts:
#	webapp/locales/it.json
 2022-11-16 11:45:19 +01:00
Moriz Wahl
cb57e09d30 change variable names for better understanding 2022-11-07 17:49:36 +01:00
Moriz Wahl
a1fcc40432 fix: Member of Group Cannot Be Added as New Member 2022-11-07 16:57:16 +01:00
Moriz Wahl
5f4bf58dc6 feat: Restrict Comments on Posts in Groups 2022-10-27 14:06:42 +02:00
Moriz Wahl
5b66edb387 add group count query 2022-10-26 13:49:25 +02:00
Moriz Wahl
57bbe4c6e8 allow search groups in permission middleware, add user id to search groups query 2022-10-21 18:34:48 +02:00
Moriz Wahl
a4cd7a8698 test search posts with groups 2022-10-05 21:54:52 +02:00
Moriz Wahl
aa870b5020 searches need authorization as they are not working without user id in context 2022-10-05 08:57:13 +02:00
Moriz Wahl
67cba104b8 remove findPosts and findUsers as they are never used. 2022-10-05 08:09:21 +02:00
Moriz Wahl
b259295094 Merge branch '5059-epic-groups' into post-in-group 2022-10-03 13:16:20 +02:00
Moriz Wahl
e748fcc623 add is member of group check to permission of create post 2022-09-22 08:16:44 +02:00
Wolfgang Huß
98b9e3d092 Rename 'isAllowedSeeingMembersOfGroup' to 'isAllowedSeeingGroupMembers' in 'permissionsMiddleware.js' 2022-09-18 20:42:17 +02:00
Wolfgang Huß
6a9c040722 Implement 'LeaveGroup' resolver 2022-09-13 20:23:34 +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
Moriz Wahl
b8ac4cc3ca add saveCategoruSettings mutation to schema 2022-09-05 17:41:21 +02:00
Wolfgang Huß
92e6cc3f1b Cleanup 2022-09-05 09:13:47 +02:00
Wolfgang Huß
4f7ce5a6c1 Fix slugification tests of 'UpdateGroup' 2022-09-01 15:04:49 +02:00
Wolfgang Huß
44eb9d0bde Implement 'UpdateGroup' resolver, not working 2022-09-01 09:31:50 +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ß
d969141fc6 Implement 'UpdateGroup' resolver, first step 2022-08-30 06:58:39 +02:00
Wolfgang Huß
48ff8610de Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-08-25 13:53:24 +02:00
Wolfgang Huß
a5857c1436 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5188-query-members-of-group 2022-08-25 13:41:46 +02:00
Tima Gixe
f0157442b9 Provide custom fallbackError to graphql-shield 2022-08-25 09:11:23 +03:00
Wolfgang Huß
72eedef8d0 Cleanup 2022-08-23 13:12:38 +02:00
Wolfgang Huß
fd497a03aa Change GQL parameter for 'ChangeGroupMemberRole' from 'id' to 'groupId' 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 11:58:23 +02:00
Wolfgang Huß
813c072dc7 Change GQL parameter for 'JoinGroup' from 'id' to 'groupId' 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 11:32:22 +02:00
Wolfgang Huß
826cf5a8e0 Renamed 'GroupMember' to 'GroupMembers' 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 11:03:47 +02:00
Wolfgang Huß
95cebd577d Refactor to group joining by ChangeGroupMemberRole and that JoinGroup is not possible for hidden groups 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 10:18:00 +02:00
Wolfgang Huß
3ab33a44f1 Check permission not given for resolver ChangeGroupMemberRole if admin will change their own member role in group already at the beginning of 'isAllowedToChangeGroupMemberRole' 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 05:21:53 +02:00
Wolfgang Huß
e3549d3aa9 Rename resolver SwitchGroupMemberRole to ChangeGroupMemberRole 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 05:11:10 +02:00
Wolfgang Huß
e91394948c Add tests for 'SwitchGroupMemberRole' resolver 2022-08-22 10:08:58 +02:00
Wolfgang Huß
0fe609e294 Add test for find all member of closed and hidden groups if you are usual member 2022-08-22 07:19:07 +02:00
Wolfgang Huß
695a71bf25 Implement 'SwitchGroupMemberRole' resolver and write the beginning to test it 2022-08-20 09:43:37 +02:00
Wolfgang Huß
14620b00eb Add tests for 'JoinGroup' and 'GroupMember' resolver 2022-08-19 10:47:17 +02:00
Wolfgang Huß
d36f0eab57 Add tests for 'GroupMember' resolver, a start 2022-08-18 11:48:26 +02:00
Wolfgang Huß
25ed30dba1 Implement 'EnterGroup' resolver 2022-08-18 10:12:11 +02:00
Wolfgang Huß
27b74eb9e1 Implement 'GroupMember' resolver, a first step 2022-08-17 12:11:52 +02:00
Wolfgang Huß
94411648fd Implement 'Group' query, first step 2022-08-03 13:29:49 +02:00
Wolfgang Huß
f565e5fb6a Implement 'CreateGroup' with tests 2022-08-02 16:20:11 +02:00
Wolfgang Huß
1639726130
Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4092-implement-new-registration 2021-03-30 04:51:44 +02:00
Ulf Gebhardt
6584151a39 fixed frontend config value evaluation & default values for INVITE_REGISTRATION. Unified the way the config is accessed. 2021-03-19 12:24:42 +01:00
Moriz Wahl
53c8b532e5 temporary invite button in backand. Must be refactored! 2021-03-19 12:24:42 +01:00
Moriz Wahl
ed51c4a786 permissions for Signup with invite code 2021-03-04 19:00:53 +01:00
Moriz Wahl
81fdb1c80e signup with invitecode to schema 2021-03-04 16:18:55 +01:00
Moriz Wahl
b2ab320270 nonce changed to 5 digit string, ValidateNonce query added 2021-03-02 04:35:53 +01:00
Moriz Wahl
1c3f628fb2 count views of post teaser 2021-03-01 15:33:20 +01:00