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

11241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
d05919fddb add active categories to current user query 2022-09-07 14:08:03 +02:00
Moriz Wahl
341e386207 linting 2022-09-07 13:37:48 +02:00
Moriz Wahl
14d9399b20 Merge branch 'master' into save-categories-in-frontend 2022-09-07 09:16:45 +02:00
Moriz Wahl
1c2a2a05fe
Merge pull request #5261 from Ocelot-Social-Community/save-category-settings 
feat: Save Category Settings
 2022-09-07 09:14:58 +02:00
Moriz Wahl
3213bd3ee4 test save categories 2022-09-06 19:17:06 +02:00
Moriz Wahl
dcdef615c1 add locales for saving categories 2022-09-06 18:51:55 +02:00
Moriz Wahl
d45ad17b43 add save button to category filters 2022-09-06 18:51:20 +02:00
Moriz Wahl
d4c338e04e add save categories mutation 2022-09-06 18:50:33 +02:00
Moriz Wahl
523d290ff8 add save icon 2022-09-06 18:50:05 +02:00
Moriz Wahl
ab662db0e4 empty array as input only clears all saved categories 2022-09-06 18:46:47 +02:00
Moriz Wahl
b262b16cf2 Merge branch 'save-category-settings' 2022-09-06 17:42:12 +02:00
Moriz Wahl
8a688ca78b improve tests 2022-09-06 15:14:31 +02:00
Moriz Wahl
60fabe587b
Merge pull request #5248 from Ocelot-Social-Community/create-topics-menu 
feat: Topics Menu
 2022-09-06 13:28:15 +02:00
Moriz Wahl
4e5d4cb873 basic tests for save category settings 2022-09-05 20:51:48 +02:00
Moriz Wahl
fc6d544ea7 add resolver for save active categories 2022-09-05 20:07:14 +02:00
Moriz Wahl
572377acfd add active categories to user 2022-09-05 20:06:10 +02:00
Moriz Wahl
b8ac4cc3ca add saveCategoruSettings mutation to schema 2022-09-05 17:41:21 +02:00
Wolfgang Huß
b80a9fdff8
Merge pull request #5253 from Ocelot-Social-Community/5252-doc-graphql-playground 
docs: 🍰 Document GraqhQL Playground
 2022-09-01 15:06:19 +02:00
Wolfgang Huß
28a742574c
Update README.md 2022-09-01 12:15:30 +02:00
Wolfgang Huß
13cd81fcf5
Update GraphQL-Playground.md 2022-09-01 12:06:28 +02:00
Wolfgang Huß
9ac943d11d
Delete GraphQL-Playground.md 2022-09-01 10:57:16 +02:00
Wolfgang Huß
1f6beffa6f
Create GraphQL-Playground.md 2022-09-01 10:32:36 +02:00
Wolfgang Huß
85569c38da
Create GraphQL-Playground.md 2022-09-01 10:31:53 +02:00
Moriz Wahl
87aa47d683 add optional topica menu when categories are active 2022-08-31 14:32:46 +02:00
Moriz Wahl
d6f8b0dc77 change category to topic in german and english locales 2022-08-31 14:28:25 +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ß
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
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
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
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