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

11943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wolfgang Huß
2434b462bb
Merge pull request #5191 from Ocelot-Social-Community/dependabot/npm_and_yarn/slug-6.0.0 
Bump slug from 5.1.0 to 6.0.0
 2022-08-25 13:31:25 +02:00
Moriz Wahl
407f4f8d2d fix test (mock .CATEGORIES_ACTIVE) 2022-08-25 13:29:08 +02:00
Wolfgang Huß
d112538e63
Merge pull request #5174 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.1 
Bump vue-sweetalert-icons from 4.3.0 to 4.3.1 in /webapp
 2022-08-25 13:29:02 +02:00
Tima Gixe
0631c4b233
Merge pull request #5206 from Ocelot-Social-Community/5203-change-error-message-with-authorised-to-authorized 
feat: 🍰 Change Error Message With `Authorised` To `Authorized` All Over The Place To Have American English
 2022-08-25 13:55:41 +03:00
Wolfgang Huß
966d515baf
Update PULL_REQUEST_TEMPLATE.md 2022-08-25 12:16:32 +02:00
Wolfgang Huß
ab3ab3b07d Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/vue-sweetalert-icons-4.3.1 2022-08-25 11:57:35 +02:00
Wolfgang Huß
22dc438a91 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/slug-6.0.0 2022-08-25 11:56:11 +02:00
Tima Gixe
4031605467 Revert comment's content 2022-08-25 12:43:55 +03:00
Wolfgang Huß
3b396fc060 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/slug-6.0.0 2022-08-25 11:39:09 +02:00
Tima Gixe
c40179ebaf
Update PULL_REQUEST_TEMPLATE.md 2022-08-25 11:17:34 +03:00
Tima Gixe
f0157442b9 Provide custom fallbackError to graphql-shield 2022-08-25 09:11:23 +03:00
Tima Gixe
c83096fe39 Adjust comments test to expect authorized 2022-08-25 09:10:59 +03:00
Tima Gixe
15ce070288 Update tests to expect Not Authorized! 2022-08-25 09:08:14 +03:00
Wolfgang Huß
80673ed4b0
Merge pull request #5168 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/cross-env-7.0.3 
Bump cross-env from 7.0.2 to 7.0.3 in /webapp
 2022-08-24 10:16:01 +02:00
Wolfgang Huß
72eedef8d0 Cleanup 2022-08-23 13:12:38 +02:00
Wolfgang Huß
47027ad86b Move 'Group' resolver to building up mode in 'groups.spec.js' 2022-08-23 12:47:57 +02:00
Wolfgang Huß
cd090420cf Move 'JoinGroup' to building up mode in 'groups.spec.js' 2022-08-23 12:30:01 +02:00
Wolfgang Huß
c7c2ebdeb7 Refine clean db mode in 'groups.spec.js' 2022-08-23 12:20:27 +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ß
b703621eb7 Remove local variables 'expected' and some 'variable' and put the values directly in the 'expect' calls in 'groups.spec.js' 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 10:52:15 +02:00
Wolfgang Huß
356fac9d94 Destruction of 'mutate' and 'query' in 'groups.spec.js' in one line now 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 10:36:37 +02:00
Wolfgang Huß
9dd819f8d2 Set not 'membership.updatedAt' on relation creation 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
 2022-08-23 10:25:39 +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ß
e1f4609c25 !!! Temp !!! 2022-08-23 04:48:38 +02:00
Moriz Wahl
d948067f44 add category name again to seed and init to avoid conflicts with graphql model 2022-08-22 20:47:37 +02:00
Moriz Wahl
ad4497786c add missing items for categories 2022-08-22 20:29:04 +02:00
Moriz Wahl
25c8fe275f add locales for yunite categories 2022-08-22 20:11:21 +02:00
Moriz Wahl
5b7bdc0291 seed Yunite categories 2022-08-22 19:56:35 +02:00
Moriz Wahl
6425e5d172 seed categories on db:migrate init 2022-08-22 19:44:20 +02:00
Moriz Wahl
c1f1408f6c add yunite categories 2022-08-22 19:17:50 +02:00
Moriz Wahl
eddaa96d36 add movement icon 2022-08-22 18:52:42 +02:00
Moriz Wahl
a22023174d feat: Show Categories Filter when Categories are Active 2022-08-22 18:33:12 +02:00
Wolfgang Huß
9312e66b15 Add bigger JS heap size to backend tests 2022-08-22 12:53:27 +02:00
Wolfgang Huß
91d797dcfa Copy profile Vue pages for the group profile 2022-08-22 12:14:54 +02:00
Wolfgang Huß
dee20c25a9 Add test todo for 'has "updatedAt" newer as "createdAt"' 2022-08-22 11:46:41 +02:00
Wolfgang Huß
b3c179011a Add URL comment for sleep 2022-08-22 11:45:51 +02:00
Wolfgang Huß
f9c8c9b4be Add different group member roles to seeding 2022-08-22 11:27:18 +02:00
Wolfgang Huß
41bf1f7d39 Refactor tests in 'groups.spec.js' to have modes 'clean db' and 'building up' 2022-08-22 10:41:31 +02:00
Wolfgang Huß
29874e54a1 Add jest dev helper function for sleeping 2022-08-22 10:40:16 +02:00
Wolfgang Huß
e91394948c Add tests for 'SwitchGroupMemberRole' resolver 2022-08-22 10:08:58 +02:00
Wolfgang Huß
74589d4d3f Resort creation of groups and its connected joins of the groups 2022-08-22 07:27:46 +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