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

11194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
1252e79be2 Fix test description from 'enter-nonce' to 'change-password' 2022-08-27 16:42:11 +02: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
b1.1.0-214 		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
b1.1.0-213 		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
b1.1.0-212 		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
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ß
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
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
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
b1.1.0-207 		2022-08-16 08:40:24 +02:00
Wolfgang Huß
2d0ba9982b Add '--logHeapUsage' to jest test call 2022-08-15 12:17:16 +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ß
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ß
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ß
e758e1337d Release v1.1.0 - implement categories again 2022-08-03 15:24:42 +02:00
Wolfgang Huß
c53bd68f4d
Merge pull request #5102 from Ocelot-Social-Community/make-categories-optional 
feat: Make Categories Optional
b1.0.9-204 		2022-08-03 14:47:01 +02:00
Wolfgang Huß
a8a6acb9f7 Rename 'UserGroup' to 'UserRole' 2022-08-03 08:14:05 +02:00
Wolfgang Huß
162adfd776
Merge pull request #5101 from Ocelot-Social-Community/Tirokk-update-issue-templates 
Update issue templates
b1.0.9-203 		2022-08-02 12:30:38 +02:00
Moriz Wahl
938f5ccdf9 fix all tests 2022-07-25 23:20:05 +02:00
Moriz Wahl
b71b20ae81 fix more tests 2022-07-25 23:04:12 +02:00
Moriz Wahl
5393c2aeaa fix some tests 2022-07-25 22:53:19 +02:00
Moriz Wahl
bc955003f7 add optional categories to teaser and post 2022-07-25 20:03:00 +02:00
Moriz Wahl
1b2509229c remove bad line in cypher 2022-07-25 19:22:17 +02:00
Moriz Wahl
28ddfde0e3 add categories active to .env, save categories on create 2022-07-25 19:02:08 +02:00
Moriz Wahl
e31f250ea5 env vatiable for CATEGORIES_ACTIVE and switch for categories in contribution form 2022-07-25 18:41:39 +02:00
Wolfgang Huß
2ac3a9f9e3
Update issue templates 2022-07-25 18:07:14 +02:00
Wolfgang Huß
458f17b3bb
Merge pull request #5097 from Ocelot-Social-Community/5093-fix-automatic-deployment 
chore: 🍰 Betters Automatic Deployment To `stage.ocelot.social` On Push To `master` Branch
b1.0.9-202 		2022-07-21 18:23:59 +02:00
Wolfgang Huß
e93b7bdcf3 Remove temporarily push branch to this one as well in 'publish.yml' 2022-07-21 17:46:51 +02:00
Wolfgang Huß
6bc4663d24 Add a comment that deployment need to come up again regulerly 3m 10s 'publish.yml' 2022-07-21 17:46:20 +02:00
Wolfgang Huß
861de8edcb Add sleep for 4 minutes (240s) in 'publish.yml' b1.0.9-201 2022-07-21 17:15:58 +02:00
Wolfgang Huß
9d6a5d7700 Change temporarily push branch to this one as well in 'publish.yml' 2022-07-21 16:56:20 +02:00
Wolfgang Huß
da1135614d
Merge pull request #5095 from Ocelot-Social-Community/5094-release-v1.0.9 
chore: 🍰 Release v1.0.9
b1.0.9-199 1.0.9 		2022-07-20 16:12:05 +02:00
Wolfgang Huß
6247734a32 Release v1.0.9 2022-07-20 14:42:38 +02:00
Wolfgang Huß
04e7957c0e
Merge pull request #5080 from Ocelot-Social-Community/5065-automatic-deployment-to-stage.ocelot.social-on-push-to-master-branch 
chore: 🍰 Automatic Deployment To `stage.ocelot.social` On Push To `master` Branch
b1.0.8-198 		2022-07-20 14:28:39 +02:00
Wolfgang Huß
34e970474e
Merge pull request #5091 from Ocelot-Social-Community/5089-link-to-releases-version 
change footer version-link
b1.0.8-197 		2022-07-20 14:12:48 +02:00
Wolfgang Huß
6c64352662 change back to publish just on master branch push 2022-07-20 13:53:09 +02:00