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

11259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
a9c52bfcae Renamed 'AvatarUploader' property from 'user' to 'profile' 
- Rename several CSS.
 2022-08-29 13:03:43 +02:00
Wolfgang Huß
ac0aacf776 Rename 'hc-upload' or 'Upload' to AvatarUploader and moved 'ImageUploader' to folder 'Uploader' 2022-08-29 12:10:23 +02:00
Wolfgang Huß
d1b940b332 Implement 'groupSince' and 'groupGoal' in group profile 2022-08-29 11:50:06 +02:00
Wolfgang Huß
f678dad50a Fix linting 2022-08-29 11:32:20 +02:00
Wolfgang Huß
6280fa99cf Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 2022-08-29 11:28:50 +02:00
Wolfgang Huß
23512c6e96 Merge branch '5059-groups/5190-group-profile' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-groups/5190-group-profile 
# Conflicts:
#	webapp/graphql/groups.js
 2022-08-29 11:28:35 +02:00
Wolfgang Huß
39487778bf Implement group profile, first step 2022-08-29 11:26:27 +02:00
Wolfgang Huß
623af5f47b Query for group 'id' directly in resolver 2022-08-29 11:18:40 +02:00
Wolfgang Huß
81b763c732
Merge pull request #5217 from Ocelot-Social-Community/5216-fix-test-description-from-enter-nonce-to-change-password 
fix: 🍰 Fix Test Description From `enter-nonce.vue` To `change-password`
 2022-08-29 09:16:17 +02:00
Wolfgang Huß
7f484b7143
Merge pull request #5218 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.2.2 
Bump cookie-universal-nuxt from 2.1.5 to 2.2.2 in /webapp
 2022-08-29 09:10:21 +02:00
Wolfgang Huß
e2c6902433 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.2.2 2022-08-27 19:31:57 +02:00
dependabot[bot]
3607ed4b68
Bump cookie-universal-nuxt from 2.1.5 to 2.2.2 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.5 to 2.2.2.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.5...v2.2.2)

---
updated-dependencies:
- dependency-name: cookie-universal-nuxt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-27 14:53:33 +00:00
Wolfgang Huß
31b1e2c13a
Merge pull request #5170 from Ocelot-Social-Community/dependabot/npm_and_yarn/webapp/prettier-2.7.1 
Bump prettier from 2.2.1 to 2.7.1 in /webapp
 2022-08-27 16:49:41 +02:00
Wolfgang Huß
1252e79be2 Fix test description from 'enter-nonce' to 'change-password' 2022-08-27 16:42:11 +02:00
Wolfgang Huß
e82d35c824 Fix linting 2022-08-25 23:17:50 +02:00
dependabot[bot]
0a02e1e402
Bump prettier from 2.2.1 to 2.7.1 in /webapp 
Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.7.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.2.1...2.7.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-25 18:15:25 +00:00
Wolfgang Huß
3f94fe189b
Merge pull request #5211 from Ocelot-Social-Community/dependabot/npm_and_yarn/backend/eslint-plugin-prettier-3.4.1 
Bump eslint-plugin-prettier from 3.1.2 to 3.4.1 in /backend
 2022-08-25 20:11:30 +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
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
Tima Gixe
88c10a03e1
Merge pull request #5208 from Ocelot-Social-Community/5207-fix-typo-in-pull-request-template 
chore: 🍰 Fix typo in PULL_REQUEST_TEMPLATE.md file
 2022-08-25 15:37:56 +03: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
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ß
e1f4609c25 !!! Temp !!! 2022-08-23 04:48:38 +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ß
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]
b7077d3b4b
Bump slug from 4.0.2 to 6.0.0 in /backend 
Bumps [slug](https://github.com/Trott/slug) from 4.0.2 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/v4.0.2...v6.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-17 04:50:20 +00: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
 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