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

8659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
 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]
7a3cd75469 build(deps-dev): bump eslint-plugin-jest in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.6.0 to 23.7.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.6.0...v23.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-10 04:18:27 +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
mattwr18
6271b53b30 Set up Subscriptions with RedisPubSub 2020-02-07 14:48:55 +01:00
roschaefer
46edc3fdd5 Replace buildList with array of Promises 
reason: Rosie.js does not support promises. So for the time being, we
shall not use more than one `after` callback and we shall not use
buildList as it does not return a `Promise.all([])`. We have to ask the
maintainers of Rosie.js if they accept the breaking change of returning
a Promise always.
 2020-02-07 14:28:57 +01:00
roschaefer
3c50255da2 Merge remote-tracking branch 'origin/master' into refactor_factories_with_rosie 2020-02-07 14:07:19 +01:00
Robert Schäfer
2d427f48d2
Merge pull request #2999 from Human-Connection/2989-add-issue-template-for-devops 
chore: Add DevOps issue template
 2020-02-07 12:00:55 +01:00
Robert Schäfer
a9b7318874
Merge pull request #2826 from Human-Connection/error-pages 
fix: Error pages can be translated
 2020-02-07 11:59:33 +01:00
mattwr18
3373bf232b
Merge pull request #3020 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.10.0 
build(deps-dev): bump apollo-server-testing from 2.9.16 to 2.10.0 in /backend
 2020-02-07 09:54:45 +01:00
mattwr18
15571695ae
Merge pull request #3019 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.10.0 
build(deps): bump apollo-server from 2.9.16 to 2.10.0 in /backend
 2020-02-07 09:54:25 +01:00
dependabot-preview[bot]
7dca739325
build(deps-dev): bump apollo-server-testing in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.16 to 2.10.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.9.16...apollo-server-testing@2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-07 04:17:46 +00:00
dependabot-preview[bot]
ae0ac37f3d
build(deps): bump apollo-server from 2.9.16 to 2.10.0 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.16 to 2.10.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.16...apollo-server@2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-07 04:17:26 +00:00
mattwr18
0851ad4c50 Add end line 2020-02-06 10:33:56 +01:00
mattwr18
896fcd50da
Merge pull request #3011 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-tag-2.10.3 
build(deps): bump graphql-tag from 2.10.2 to 2.10.3 in /backend
 2020-02-06 09:58:51 +01:00
dependabot-preview[bot]
f1e60b2362
build(deps): bump graphql-tag from 2.10.2 to 2.10.3 in /backend 
Bumps [graphql-tag](https://github.com/apollographql/graphql-tag) from 2.10.2 to 2.10.3.
- [Release notes](https://github.com/apollographql/graphql-tag/releases)
- [Changelog](https://github.com/apollographql/graphql-tag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/graphql-tag/compare/v2.10.2...v2.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-06 08:04:09 +00:00
mattwr18
5ca80adba4
Merge pull request #3010 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-7.0.10 
build(deps): bump graphql-shield from 7.0.9 to 7.0.10 in /backend
 2020-02-06 09:02:10 +01:00
dependabot-preview[bot]
cdddd5b092
build(deps): bump graphql-shield from 7.0.9 to 7.0.10 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.9 to 7.0.10.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.9...v7.0.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-06 04:19:04 +00:00
mattwr18
7ac973f9a1 Refactor cypher statement to simplify 
- it's questionable whether this simplifies it or not, and actually adds
  one line of code, but now it looks more similiar to the code in the
notifications query
 2020-02-05 20:45:56 +01:00
mattwr18
6cf067937d Clean up 
- remove the code for subscriptions to Post as we won't implement this
  at this time... I've created a new branch with the code that can be
built on later
- remove unused subscription path
- add possibility to use websockets uri for production env.
 2020-02-05 20:24:23 +01:00
mattwr18
1c6a5503db Get subscriptions working with notifyUserOfComment 
- Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
 2020-02-05 19:06:55 +01:00
mattwr18
c6dbbaeece
Merge pull request #2998 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-actions-5.3.12 
build(deps-dev): bump @storybook/addon-actions from 5.3.10 to 5.3.12 in /webapp
 2020-02-05 18:45:49 +01:00
mattwr18
110165691a Refactor out transformReturnType function 
- we have introduced a better way to return all the info we want without
  needing to make multiple database queries. It was introduced by
@roschaefer in the PR for the notifications query, but we hadn't
refactored markAsRead yet.
- Now that we are subscribing to notifications, we need to have the same
  return info as the notification query.

- Co-authored-by: Tirokk <wolle.huss@pjannto.com>
 2020-02-05 18:42:31 +01:00
mattwr18
2f43069ea0 Subscribe to notifications/remove polling 
- We want to publish when a notification occurs for a specific user, not
  have the client poll the backend for ever user every minute.

- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
 2020-02-05 17:37:38 +01:00
mattwr18
04f0467d2d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-05 14:33:57 +01:00
dependabot-preview[bot]
9241c6f5db
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.10 to 5.3.12.
- [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.12/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 12:41:57 +00:00
mattwr18
decc701c2e
Merge pull request #2997 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-notes-5.3.12 
build(deps-dev): bump @storybook/addon-notes from 5.3.10 to 5.3.12 in /webapp
 2020-02-05 13:38:30 +01:00
dependabot-preview[bot]
13644faf79
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.10 to 5.3.12.
- [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.12/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 10:07:06 +00:00
mattwr18
3413885b0c
Merge pull request #2996 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.3.12 
build(deps-dev): bump @storybook/addon-a11y from 5.3.10 to 5.3.12 in /webapp
 2020-02-05 11:04:32 +01:00
mattwr18
77ed5a2755
Merge pull request #2994 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.10.7 
build(deps): bump metascraper-author from 5.10.6 to 5.10.7 in /backend
 2020-02-05 11:04:11 +01:00
mattwr18
7371c5b35c Add DevOps issue template 2020-02-05 10:46:55 +01:00