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

11233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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ß
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
b1.1.0-211 		2022-08-25 13:31:25 +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
b1.1.0-210 		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
b1.1.0-209 		2022-08-25 13:55:41 +03: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
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
b1.1.0-208 		2022-08-24 10:16:01 +02:00
Wolfgang Huß
9312e66b15 Add bigger JS heap size to backend tests 2022-08-22 12:53:27 +02:00
Wolfgang Huß
acaf3aacb8 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	backend/package.json
 2022-08-17 09:10:29 +02:00
dependabot[bot]
92f4b7b813
Bump slug from 5.1.0 to 6.0.0 
Bumps [slug](https://github.com/Trott/slug) from 5.1.0 to 6.0.0.
- [Release notes](https://github.com/Trott/slug/releases)
- [Changelog](https://github.com/Trott/slug/blob/main/CHANGELOG.md)
- [Commits](https://github.com/Trott/slug/compare/v5.1.0...v6.0.0)

---
updated-dependencies:
- dependency-name: slug
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-17 04:17:15 +00:00
dependabot[bot]
73559242d6
Bump cross-env from 7.0.2 to 7.0.3 in /webapp 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v7.0.2...v7.0.3)

---
updated-dependencies:
- dependency-name: cross-env
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-16 06:44:19 +00:00
Wolfgang Huß
1ea7465114
Merge pull request #5182 from Ocelot-Social-Community/5181-add-informations-for-memory-usage-to-backend-tests 
chore: 🍰 Add `--logHeapUsage` To Jest Test Call
b1.1.0-207 		2022-08-16 08:40:24 +02:00
Wolfgang Huß
f6e9cb1c6f
Merge pull request #5185 from Ocelot-Social-Community/5059-groups/5183-add-groups-to-seeding 
chore: 🍰 Add Groups To Seeding
 2022-08-15 21:17:05 +02:00
Wolfgang Huß
e2c987f300 Refine categories of seeded groups 2022-08-15 16:14:19 +02:00
Wolfgang Huß
2ea9d5b9ee Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5183-add-groups-to-seeding 2022-08-15 15:24:05 +02:00
Wolfgang Huß
bbda8e6dd0 Seed some groups 2022-08-15 15:22:49 +02:00
Wolfgang Huß
0f8abe770a Move GQL mutation 'loginMutation' in 'user_management.spec.js' into a separate file 2022-08-15 15:02:04 +02:00
Wolfgang Huß
916dfbb46e Move or use GQL mutations in seeding to or from separate files 2022-08-15 14:00:36 +02:00
Wolfgang Huß
032cf7c182
Merge pull request #5139 from Ocelot-Social-Community/5059-groups/5131-implement-group-gql-model-and-crud 
feat: 🍰 Implement Group GQL Model And CRUD Resolvers – First Step
 2022-08-15 13:35:57 +02:00
Wolfgang Huß
2d0ba9982b Add '--logHeapUsage' to jest test call 2022-08-15 12:17:16 +02:00
Moriz Wahl
beacad4a17 set CONFIG in specs 2022-08-15 11:07:45 +02:00
Moriz Wahl
dd876c52fa increas max-old-space-size for jest, handle some asyncs, test validation for caregories only if categories are active 2022-08-15 10:52:31 +02:00
dependabot[bot]
d2f6590e05
Bump vue-sweetalert-icons from 4.3.0 to 4.3.1 in /webapp 
Bumps [vue-sweetalert-icons](https://github.com/JorgenVatle/vue-sweetalert-icons) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/JorgenVatle/vue-sweetalert-icons/releases)
- [Commits](https://github.com/JorgenVatle/vue-sweetalert-icons/compare/v4.3.0...v4.3.1)

---
updated-dependencies:
- dependency-name: vue-sweetalert-icons
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-11 04:25:39 +00:00
Wolfgang Huß
b0d28f8649 Rename 'descriptionAddition100' to 'descriptionAdditional100' 2022-08-10 13:19:42 +02:00
Wolfgang Huß
5e741ead8d Overtake Moriz suggestions 2022-08-10 13:15:43 +02:00
Wolfgang Huß
f150ea3d7c
Update backend/src/schema/resolvers/groups.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-10 12:52:31 +02:00
Wolfgang Huß
82401b1488
Update backend/src/schema/resolvers/groups.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-08-10 12:52:20 +02:00
Wolfgang Huß
7682aa7e45 Fix description length for slugify tests 2022-08-10 11:34:51 +02:00
Wolfgang Huß
9cae32e6e1 Upgrade neode to v0.4.8 2022-08-10 08:41:01 +02:00
Wolfgang Huß
3d1b403656 Add relation 'CREATED' between owner and group 2022-08-09 16:55:43 +02:00
Wolfgang Huß
0149af12d4 Cleanup 2022-08-09 16:50:28 +02:00
Wolfgang Huß
78eeb7e497 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud 2022-08-09 16:37:54 +02:00
Wolfgang Huß
d61506aa96 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-08-09 16:37:02 +02:00
Wolfgang Huß
117bd5e4e6 Implement error for to short 'description' and test it 2022-08-09 16:34:50 +02:00
Wolfgang Huß
b5678f7c61 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud 
# Conflicts:
#	backend/src/schema/types/type/User.gql
 2022-08-09 14:50:11 +02:00
Wolfgang Huß
f6bfc8aa7f
Merge pull request #5143 from Ocelot-Social-Community/5142-rename-UserGroup-to-UserRole 
refactor: 🍰 Rename `UserGroup` To `UserRole`
b1.1.0-206 		2022-08-09 09:02:27 +02:00
Wolfgang Huß
61344fc96b Implement errors for to less or to many categories and test it 2022-08-09 08:50:25 +02:00
Wolfgang Huß
7847d6912c Return 'categories' in the 'Group' GQL query 2022-08-09 08:21:26 +02:00
Wolfgang Huß
b12056594f Add issue to TODO comment 2022-08-09 07:15:30 +02:00
Wolfgang Huß
504a9bcd49 Merge branch '5059-epic-groups' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud 2022-08-04 09:28:45 +02:00
Wolfgang Huß
5e0446e22c Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-08-04 09:26:35 +02:00
Wolfgang Huß
fcca0f378d Implement 'Group' query, next step 2022-08-04 09:24:04 +02:00
Wolfgang Huß
63dce8503e
Merge pull request #5145 from Ocelot-Social-Community/5144-release-v1.1.0--implement-categories-again 
chore: 🍰 Release v1.1.0 - Implement Categories Again
b1.1.0-205 1.1.0 		2022-08-04 05:42:54 +02:00
Wolfgang Huß
2107dd4be8 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5131-implement-group-gql-model-and-crud 
# Conflicts:
#	backend/.env.template
#	webapp/.env.template
 2022-08-03 15:56:10 +02:00
Wolfgang Huß
e758e1337d Release v1.1.0 - implement categories again 2022-08-03 15:24:42 +02:00
Wolfgang Huß
867b78dfa3 Implement 'Group' query, second step 2022-08-03 15:16:23 +02:00