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

8636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
abdellani
cd62bb457b Removes popover menu 2020-02-13 00:46:50 +01: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
mattwr18
70bb034343 Remove unused email property from user factory 2020-02-10 13:13:51 +01:00
mattwr18
3b29d480e3 Display unblock feature only for blocking user 
- add hasBlocked query to check if userA initiated the blocking and, if
  true, only them to unblock userB.
- add cypress tests to make sure we don't break this in the future.
 2020-02-10 12:34:40 +01:00
mattwr18
8f6d71e4be Update helm charts 2020-02-10 10:46:55 +01:00
mattwr18
403376418f Merge pull request #3031 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-4.2.2 
build(deps-dev): bump @vue/cli-shared-utils from 4.1.2 to 4.2.2 in /webapp
 2020-02-10 09:41:35 +01:00
mattwr18
bdd1024d03 Merge pull request #3028 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.11 
build(deps): bump graphql-shield from 7.0.10 to 7.0.11 in /backend
 2020-02-10 09:41:04 +01:00
mattwr18
a1e7f6d735 Merge pull request #3027 from Human-Connection/dependabot/npm_and_yarn/codecov-3.6.5 
build(deps-dev): bump codecov from 3.6.4 to 3.6.5
 2020-02-10 09:40:35 +01:00
dependabot-preview[bot]
e8410a62dc build(deps-dev): bump @vue/cli-shared-utils in /webapp 
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.1.2 to 4.2.2.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.2.2/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 04:31:28 +00:00
dependabot-preview[bot]
64d90e5311 build(deps): bump graphql-shield from 7.0.10 to 7.0.11 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.10 to 7.0.11.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.10...v7.0.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 04:17:22 +00:00
dependabot-preview[bot]
3808823578 build(deps-dev): bump codecov from 3.6.4 to 3.6.5 
Bumps [codecov](https://github.com/codecov/codecov-node) from 3.6.4 to 3.6.5.
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](https://github.com/codecov/codecov-node/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 04:16:48 +00:00
roschaefer
a77f8d92bc Speed up factories a little 2020-02-08 17:55:07 +01:00
mattwr18
069c637c84 Run yarn install to update yarn.lock 2020-02-07 15:10:45 +01:00
mattwr18
7488e724cb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-07 14:50:53 +01:00