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

3947 Commits

Author SHA1 Message Date
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
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
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
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
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
Moriz Wahl
86f298f8e5 prettier, prettier 2020-02-06 23:00:06 +01:00
Moriz Wahl
4905b09b3e migration added to swap lat and lng in db 2020-02-06 20:47:45 +01:00
Moriz Wahl
cb8b2acffd swap lng and lat in db seed 2020-02-06 19:56:44 +01:00
Moriz Wahl
976583b235 fixing test for geolocation 2020-02-06 19:56:44 +01:00
Moriz Wahl
ef9d351fcf swap lat and lng 2020-02-06 19:56:44 +01:00
mattwr18
0851ad4c50 Add end line 2020-02-06 10:33:56 +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
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
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
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
f771936aa6
Merge pull request #2978 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.10.7 
build(deps): bump metascraper-title from 5.10.6 to 5.10.7 in /backend
 2020-02-05 10:06:57 +01:00
dependabot-preview[bot]
4d7c31a550
build(deps): bump metascraper-author from 5.10.6 to 5.10.7 in /backend 
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [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.6...v5.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 07:58:24 +00:00
dependabot-preview[bot]
010402351d
build(deps): bump metascraper-title from 5.10.6 to 5.10.7 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [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.6...v5.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 07:57:24 +00:00
mattwr18
1a4e4b66ef
Merge pull request #2993 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.10.7 
build(deps): bump metascraper-audio from 5.10.6 to 5.10.7 in /backend
 2020-02-05 08:56:28 +01:00
mattwr18
2eed2260b4
Merge pull request #2992 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-tag-2.10.2 
build(deps): bump graphql-tag from 2.10.1 to 2.10.2 in /backend
 2020-02-05 08:56:01 +01:00
mattwr18
11308afd17
Merge pull request #2991 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.10.7 
build(deps): bump metascraper-url from 5.10.6 to 5.10.7 in /backend
 2020-02-05 08:55:33 +01:00
dependabot-preview[bot]
aed4dcffe0
build(deps): bump metascraper-audio from 5.10.6 to 5.10.7 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [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.6...v5.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 04:18:29 +00:00
dependabot-preview[bot]
73ed5e89fa
build(deps): bump graphql-tag from 2.10.1 to 2.10.2 in /backend 
Bumps [graphql-tag](https://github.com/apollographql/graphql-tag) from 2.10.1 to 2.10.2.
- [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.1...v2.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 04:18:03 +00:00
dependabot-preview[bot]
4724e8e6ee
build(deps): bump metascraper-url from 5.10.6 to 5.10.7 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [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.6...v5.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 04:17:18 +00:00
dependabot-preview[bot]
0e49702b7e
build(deps): bump @sentry/node from 5.12.0 to 5.12.3 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.12.0 to 5.12.3.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.12.0...5.12.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-05 04:16:54 +00:00
mattwr18
cb94779111
Merge pull request #2976 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.11.0 
build(deps): bump metascraper from 5.10.6 to 5.11.0 in /backend
 2020-02-04 20:05:10 +01:00
mattwr18
564bc4a796
Merge pull request #2975 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.10.7 
build(deps): bump metascraper-logo from 5.10.6 to 5.10.7 in /backend
 2020-02-04 20:04:36 +01:00
dependabot-preview[bot]
0d6cbabcf8
build(deps): bump metascraper from 5.10.6 to 5.11.0 in /backend 
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.11.0.
- [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.6...v5.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 12:34:27 +00:00
mattwr18
4cd3db1587
Merge pull request #2952 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.10.7 
build(deps): bump metascraper-video from 5.10.6 to 5.10.7 in /backend
 2020-02-04 13:32:08 +01:00
dependabot-preview[bot]
572b942c86
build(deps): bump metascraper-logo from 5.10.6 to 5.10.7 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [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.6...v5.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 11:00:15 +00:00
mattwr18
fcd508685f
Merge pull request #2950 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.10.7 
build(deps): bump metascraper-lang from 5.10.6 to 5.10.7 in /backend
 2020-02-04 11:58:17 +01:00
mattwr18
f9ff21c89b
Merge pull request #2948 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.11.0 
build(deps): bump metascraper-description from 5.10.6 to 5.11.0 in /backend
 2020-02-04 11:58:04 +01:00
mattwr18
407ef83f70
Merge pull request #2977 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.12.0 
build(deps): bump @sentry/node from 5.11.2 to 5.12.0 in /backend
 2020-02-04 10:22:07 +01:00
dependabot-preview[bot]
2df2bf99a2
build(deps): bump metascraper-video from 5.10.6 to 5.10.7 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [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.6...v5.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 08:29:48 +00:00
dependabot-preview[bot]
f7f313950f
build(deps): bump metascraper-lang from 5.10.6 to 5.10.7 in /backend 
Bumps [metascraper-lang](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.10.7.
- [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.6...v5.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 08:28:43 +00:00
dependabot-preview[bot]
8350e56592
build(deps): bump metascraper-description in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.10.6 to 5.11.0.
- [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.6...v5.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-02-04 08:28:43 +00:00
mattwr18
feb2b32063
Merge pull request #2945 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.10.7 
build(deps): bump metascraper-soundcloud from 5.10.6 to 5.10.7 in /backend
 2020-02-04 09:27:34 +01:00
mattwr18
fcd65b92cc
Merge pull request #2944 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.10.7 
build(deps): bump metascraper-date from 5.10.6 to 5.10.7 in /backend
 2020-02-04 09:26:45 +01:00