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

8649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
3421afe4e0 Refactor tests, next step 2020-02-19 13:33:00 +01:00
Wolfgang Huß
5ffaac193d Refactor tests, going on 2020-02-19 11:37:31 +01:00
Wolfgang Huß
f380915b2c Refactor GQL and tests, first approach 2020-02-19 08:09:14 +01:00
Wolfgang Huß
ba3cfa8e04 Set sensible report properties to moderators only in the permissionsMiddleware 2020-02-14 16:52:51 +01:00
mattwr18
6ea2f3c8a9
Merge pull request #3029 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-23.7.0 
build(deps-dev): bump eslint-plugin-jest from 23.6.0 to 23.7.0 in /backend
 2020-02-14 11:28:18 +01:00
mattwr18
3d64700ce1
Merge pull request #3073 from Human-Connection/dependabot/npm_and_yarn/webapp/cookie-universal-nuxt-2.1.2 
build(deps): bump cookie-universal-nuxt from 2.1.1 to 2.1.2 in /webapp
 2020-02-14 09:29:48 +01:00
mattwr18
8b5935a0b1
Merge pull request #3072 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/sentry-3.2.3 
build(deps): bump @nuxtjs/sentry from 3.2.2 to 3.2.3 in /webapp
 2020-02-14 09:28:43 +01:00
mattwr18
ffa06b6678
Merge pull request #3067 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.11.1 
build(deps): bump metascraper-image from 5.10.7 to 5.11.1 in /backend
 2020-02-14 09:27:34 +01:00
dependabot-preview[bot]
62d4947dd8
build(deps): bump cookie-universal-nuxt from 2.1.1 to 2.1.2 in /webapp 
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.1.1...v2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:23:49 +00:00
dependabot-preview[bot]
4fae9191c1
build(deps): bump @nuxtjs/sentry from 3.2.2 to 3.2.3 in /webapp 
Bumps [@nuxtjs/sentry](https://github.com/nuxt-community/sentry-module) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/nuxt-community/sentry-module/releases)
- [Changelog](https://github.com/nuxt-community/sentry-module/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/sentry-module/compare/v3.2.2...v3.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:23:15 +00:00
dependabot-preview[bot]
b93ed8dc1b
build(deps): bump metascraper-image from 5.10.7 to 5.11.1 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.10.7 to 5.11.1.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/compare/v5.10.7...v5.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-14 04:18:52 +00:00
mattwr18
07f087c20d
Merge pull request #3060 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-loader-15.9.0 
build(deps-dev): bump vue-loader from 15.8.3 to 15.9.0 in /webapp
 2020-02-13 08:58:18 +01:00
dependabot-preview[bot]
5a50a88714
build(deps-dev): bump vue-loader from 15.8.3 to 15.9.0 in /webapp 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.8.3 to 15.9.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.8.3...v15.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-13 04:19:42 +00:00
mattwr18
26a1715dd1
Merge pull request #3049 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.3.13 
build(deps-dev): bump @storybook/addon-actions from 5.3.12 to 5.3.13 in /webapp
 2020-02-12 20:19:29 +01:00
mattwr18
156410b376
Merge pull request #3042 from Human-Connection/2887-refactor-login-step 
refactor(cypress): Speed up builds, avoid login through UI
 2020-02-12 18:57:51 +01:00
dependabot-preview[bot]
f9829e573d
build(deps-dev): bump @storybook/addon-actions in /webapp 
Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.3.12 to 5.3.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.13/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 17:04:41 +00:00
mattwr18
50ec01d718
Merge pull request #1705 from Human-Connection/1703-add-vue-apollo-subsriptions 
feat: 🍰 Set up Vue-Apollo Subscriptions
 2020-02-12 18:02:05 +01:00
Robert Schäfer
c9d53214ad
Merge pull request #3053 from Human-Connection/fix-issue-template-with-icon 
fix: Update devops_ticket.md
 2020-02-12 16:24:45 +01:00
mattwr18
4391915611 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-12 16:14:05 +01:00
roschaefer
d11e79854c Add jsonwebtoken to development dependencies 2020-02-12 15:54:22 +01:00
mattwr18
9e71855b60
Update devops_ticket.md 2020-02-12 15:45:06 +01:00
Robert Schäfer
544b64442a
Merge pull request #3048 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.13 
build(deps-dev): bump @storybook/addon-notes from 5.3.12 to 5.3.13 in /webapp
 2020-02-12 13:26:28 +01:00
Robert Schäfer
4048b427fd
Merge pull request #3050 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.13 
build(deps-dev): bump @storybook/addon-a11y from 5.3.12 to 5.3.13 in /webapp
 2020-02-12 13:26:01 +01:00
mattwr18
b4fe3de4bb
Merge pull request #3041 from Human-Connection/node_v13_compatiblity 
build(deps): Node v13 compatbility
 2020-02-12 11:40:36 +01:00
dependabot-preview[bot]
5d8d4d7955
build(deps-dev): bump @storybook/addon-notes in /webapp 
Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.3.12 to 5.3.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v5.3.13/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.13/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 09:53:35 +00:00
dependabot-preview[bot]
999cd392cb
build(deps-dev): bump @storybook/addon-a11y in /webapp 
Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.3.12 to 5.3.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.13/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 09:53:32 +00:00
mattwr18
2b852e8ecd
Merge pull request #3045 from Human-Connection/dependabot/npm_and_yarn/backend/request-2.88.2 
build(deps): bump request from 2.88.0 to 2.88.2 in /backend
 2020-02-12 10:51:43 +01:00
mattwr18
d82f553a52
Merge pull request #3046 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.3.13 
build(deps-dev): bump @storybook/vue from 5.3.12 to 5.3.13 in /webapp
 2020-02-12 10:51:07 +01:00
dependabot-preview[bot]
3f1f60edf5
build(deps-dev): bump @storybook/vue from 5.3.12 to 5.3.13 in /webapp 
Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.3.12 to 5.3.13.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.3.13/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 04:24:18 +00:00
dependabot-preview[bot]
b6f505d4be
build(deps): bump request from 2.88.0 to 2.88.2 in /backend 
Bumps [request](https://github.com/request/request) from 2.88.0 to 2.88.2.
- [Release notes](https://github.com/request/request/releases)
- [Changelog](https://github.com/request/request/blob/master/CHANGELOG.md)
- [Commits](https://github.com/request/request/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-12 04:17:48 +00:00
roschaefer
2f0e40e0e4 build(deps): Node v13 compatbility 
Through https://github.com/jaydenseric/graphql-upload/issues/170#issue-527336432
 2020-02-11 23:18:37 +01:00
mattwr18
fb429f6ef3 Fix BlockUser/MuteUser.feature 2020-02-11 21:57:20 +01:00
mattwr18
2adfe1665b Implement direct login in cypress tests 
- there is a manualLogin for tests which test the manual logging in, all
  others just set the cookie in the frontend
 2020-02-11 21:44:19 +01:00
mattwr18
984143d95c
Merge pull request #1613 from Human-Connection/helm 
feat(deployment): Add helm charts for deploy
 2020-02-11 20:33:09 +01:00
Robert Schäfer
73b2c005bf
Merge pull request #3039 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-svg-loader-0.16.0 
build(deps-dev): bump vue-svg-loader from 0.15.0 to 0.16.0 in /webapp
 2020-02-11 19:56:40 +01:00
mattwr18
8773589d82 Add develop mailserver, upgrade version 2020-02-11 11:57:25 +01:00
mattwr18
b665957373
Merge pull request #3037 from Human-Connection/3036-increase-body-parser-limit 
fix: Increase body parser limit
 2020-02-11 11:32:04 +01:00
dependabot-preview[bot]
11989edca2
build(deps-dev): bump vue-svg-loader from 0.15.0 to 0.16.0 in /webapp 
Bumps [vue-svg-loader](https://github.com/visualfanatic/vue-svg-loader) from 0.15.0 to 0.16.0.
- [Release notes](https://github.com/visualfanatic/vue-svg-loader/releases)
- [Commits](https://github.com/visualfanatic/vue-svg-loader/compare/0.15.0...0.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-11 04:22:25 +00:00
mattwr18
708ab6ecde Set equal to nginx max body size 2020-02-10 19:21:53 +01:00
mattwr18
00195f1615 Increase body parser limit 
- The default limit is only 100kb
- we are getting many requests that exceed this limit
- not sure about what would be an appropriate limit, but have seen 50mb
  in many examples.
 2020-02-10 19:16:41 +01:00
mattwr18
6662f57fba
Merge pull request #3035 from Human-Connection/update-to-version-0.3.1 
chore: Update to v0.3.1
 2020-02-10 18:09:46 +01:00
mattwr18
f16c8b27e7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-10 17:37:34 +01:00
mattwr18
63ef9e339d chore: Update to v0.3.1 2020-02-10 17:33:31 +01:00
mattwr18
13d46ff336 v0.3.1 2020-02-10 17:23:50 +01:00
mattwr18
409150813d Update to use PubSub in development 
- for some reason RedisPubSub works locally, but with docker it tries to
  connect to Redis and therefore it doesn't pass the build. PubSub is
imported from graphql-subscriptions which is a dependency of
apollo-server-express, and suitable for dev purposes.
 2020-02-10 17:19:19 +01:00
mattwr18
de793e336c
Merge pull request #3034 from Human-Connection/3033-fix-block-users-bug 
fix: Display unblock feature only for blocking user
v0.3.1 		2020-02-10 17:11:35 +01:00
mattwr18
5347f734af Fix cypress tests/frontend implementation 
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
 2020-02-10 16:25:00 +01:00
mattwr18
bcf9680ad9 Add type resolver for hasBlocked 2020-02-10 14:33:49 +01:00
mattwr18
c2802aa4f2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 3033-fix-block-users-bug 2020-02-10 14:24:32 +01:00
mattwr18
1fce867b46
Merge pull request #2921 from Human-Connection/refactor_factories_with_rosie 
refactor(factories): Refactor test factories with rosie.js
 2020-02-10 14:03:03 +01:00