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

3436 Commits

Author SHA1 Message Date
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
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ß
10d88df02c Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5188-query-members-of-group 
# Conflicts:
#	backend/src/schema/resolvers/groups.spec.js
 2022-08-29 10:03:46 +02:00
Wolfgang Huß
6beb69052f Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-08-29 09:58:55 +02:00
Wolfgang Huß
512784e580 Fix group tests 2022-08-25 20:17:23 +02:00
Wolfgang Huß
7f64c36d4c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/backend/eslint-plugin-prettier-3.4.1 2022-08-25 18:41:00 +02:00
Wolfgang Huß
f2aba3e12e Put exclamation mark behind console log text of successfully created default admin user for consistency 2022-08-25 18:03:21 +02:00
Wolfgang Huß
d8d080dae5 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into categories-filter-menu 2022-08-25 17:39:38 +02:00
dependabot[bot]
eef8d60046
Bump eslint-plugin-prettier from 3.1.2 to 3.4.1 in /backend 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.2 to 3.4.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 15:37:22 +00:00
Wolfgang Huß
1069c3b910
Merge pull request #5193 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/slug-6.0.0 
Bump slug from 4.0.2 to 6.0.0 in /backend
 2022-08-25 17:35:21 +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ß
921adb9d8b Fixed all tests 2022-08-25 13:47:37 +02:00
Wolfgang Huß
c3ab014d9c Set 'updatedAt' to 'null' on 'MEMBER_OF' creation in all group resolvers 2022-08-25 13:44:05 +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
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
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ß
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
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
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
Wolfgang Huß
9312e66b15 Add bigger JS heap size to backend tests 2022-08-22 12:53:27 +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