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
Matt Rider
08899a4af9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-01 09:22:57 +02:00
dependabot-preview[bot]
25925dddf5
Bump apollo-server-express from 2.8.0 to 2.8.1 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.8.0 to 2.8.1.
- [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-express@2.8.0...apollo-server-express@2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-01 04:26:43 +00:00
dependabot-preview[bot]
0a1d100981
Bump merge-graphql-schemas from 1.6.1 to 1.7.0 in /backend 
Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/Urigo/merge-graphql-schemas/releases)
- [Changelog](https://github.com/Urigo/merge-graphql-schemas/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Urigo/merge-graphql-schemas/commits/v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-01 04:25:36 +00:00
dependabot-preview[bot]
715db0a754
Bump eslint-plugin-jest from 22.14.0 to 22.14.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.14.0 to 22.14.1.
- [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/v22.14.0...v22.14.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-01 04:24:27 +00:00
dependabot-preview[bot]
dda1401a8a
Bump apollo-server-testing from 2.8.0 to 2.8.1 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.8.0 to 2.8.1.
- [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.8.0...apollo-server-testing@2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-01 04:23:45 +00:00
Robert Schäfer
72edf78889 Meld a chaotic commit history into one commit 
Some important commit messages:

```
    Fix youtu.be not being embedded

    And also try to maintain the old behaviour matching
    `provider.provider_url`.
```

```
    Remove confusing code comments and obsolete code

    I discovered that the behaviour of no duplicate notifications being send
    out is caused by the frontend: When the editor reads html from the
    backend, it will parse hashtags and mentions as ordinary links, not as
    their respective nodes during editing. Also, we don't have to worry
    about duplicate ids being found: The cypher statement will implicitly
    suppress duplicate notification nodes for the same user.

    So let's remove the code to avoid confusing the next developer.
```

```
    Test editor.getHTML()

    I do this because I'm not able to test the content of `this.editor` from
    a wrapper of `vue-test-utils`. If I call `this.editor.getHTML` directly
    and use it as a computed property `renderedContent` to populate a `<div
    v-html="renderedContent" />` this will not work for the embeds. So, my
    current best bet is to test the editor object isolated from a real
    component. ;(
```

```
    Add core-js as explicit dependency

    Because of build errors on Travis.

    See: https://stackoverflow.com/a/55313456

    Remove as soon as this issue is resolved:
    https://github.com/storybookjs/storybook/issues/7591

```

```
    Refactor: Keep Runtime-only builds

    See: https://vuejs.org/v2/guide/installation.html#Runtime-Compiler-vs-Runtime-only
```
 2019-08-01 00:28:22 +02:00
Robert Schäfer
c65cc3e0e5 Implement+test SocialMedia.ownedBy resolver 
Explicitly define `SocialMedia` graphql type and exclude it from
`neo4j-graphql-js`.
 2019-07-31 18:07:48 +02:00
Robert Schäfer
448706ab18 Merge remote-tracking branch 'origin/master' into refactor-social-media-backend 2019-07-31 17:36:02 +02:00
Matt Rider
5423412958 Set up UI 2019-07-31 14:58:05 +02:00
Wolfgang Huß
49f5851d2c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 806-HcContributionForm-submit-is-not-disabled-by-default 2019-07-31 13:14:43 +02:00
Robert Schäfer
c20eead22e
Merge pull request #1136 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.8.0 
Bump apollo-server-testing from 2.7.2 to 2.8.0 in /backend
 2019-07-30 15:45:15 +02:00
Matt Rider
0a98113c2d Add backend tests for RemovePostEmotions 2019-07-30 13:28:30 +02:00
dependabot-preview[bot]
e996b39741
Bump apollo-server-testing from 2.7.2 to 2.8.0 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.7.2 to 2.8.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.7.2...apollo-server-testing@2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-30 10:45:34 +00:00
dependabot-preview[bot]
e7449b3774
Bump apollo-server from 2.7.2 to 2.8.0 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.7.2 to 2.8.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.7.2...apollo-server@2.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-30 10:45:30 +00:00
dependabot-preview[bot]
ddefe81b9d
Bump graphql-middleware from 3.0.2 to 3.0.3 in /backend 
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v3.0.2...v3.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-30 04:27:44 +00:00
Alina Beck
d83819dae3 add social media back into user resolver 2019-07-29 23:19:09 +02:00
Alina Beck
afe61ce4a2 add social media back into user schema 2019-07-29 22:51:11 +02:00
Alina Beck
c7d72bfdee use apollo test client in social media tests 2019-07-29 17:22:37 +02:00
Alina Beck
e161416eff use neode instance in social media resolver 2019-07-29 17:22:05 +02:00
Alina Beck
355c7c764c remove social media from user resolver 2019-07-29 17:20:36 +02:00
Alina Beck
0e1abad123 adjust social media types to fit new definition 2019-07-29 17:19:13 +02:00
Alina Beck
ab3fea19d5 add SocialMedia model 2019-07-29 17:17:18 +02:00
Alina Beck
4f068116b9 add social media permissions in middleware 2019-07-29 17:16:40 +02:00
Alina Beck
0439b4407b remove social media validations from middleware 2019-07-29 17:16:05 +02:00
Matt Rider
3e43539e23 Set up some backend tests for emotions 2019-07-29 17:08:07 +02:00
Wolfgang Huß
a542b33f79
Merge pull request #1053 from Human-Connection/refine-social-media 
🍰 Refine social media
 2019-07-29 16:08:08 +02:00
Matt Rider
322ec597a3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-07-29 12:40:01 +02:00
mattwr18
ab022d6bbb
Merge pull request #1128 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.7.2 
Bump apollo-server from 2.7.0 to 2.7.2 in /backend
 2019-07-29 12:17:55 +02:00
mattwr18
82c515d84f
Merge pull request #1127 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.7.2 
Bump apollo-server-testing from 2.7.0 to 2.7.2 in /backend
 2019-07-29 12:17:37 +02:00
mattwr18
c2e69bd564
Merge pull request #1130 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.14.0 
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /backend
 2019-07-29 09:28:57 +02:00
dependabot-preview[bot]
31d093ed47
Bump apollo-server from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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.7.0...apollo-server@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 07:26:46 +00:00
Matt Rider
3d7d735418 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/backend/apollo-server-testing-2.7.2 2019-07-29 09:26:08 +02:00
mattwr18
0cd929645e
Merge pull request #1126 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.7.2 
Bump apollo-server-express from 2.7.0 to 2.7.2 in /backend
 2019-07-29 09:24:23 +02:00
mattwr18
bd5d6829ff
Merge pull request #1118 from Human-Connection/dependabot/docker/backend/node-12.7-alpine 
Bump node from 12.6-alpine to 12.7-alpine in /backend
 2019-07-29 09:22:31 +02:00
mattwr18
8b4fd02398
Merge pull request #1114 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.6.3 
Bump metascraper-video from 4.10.2 to 5.6.3 in /backend
 2019-07-29 09:18:47 +02:00
dependabot-preview[bot]
8deee89c7e
Bump eslint-plugin-jest from 22.13.6 to 22.14.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.13.6 to 22.14.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/v22.13.6...v22.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:30:56 +00:00
dependabot-preview[bot]
f2e20db838
Bump apollo-server-testing from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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.7.0...apollo-server-testing@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:29:19 +00:00
dependabot-preview[bot]
137a761f90
Bump apollo-server-express from 2.7.0 to 2.7.2 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.7.0 to 2.7.2.
- [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-express@2.7.0...apollo-server-express@2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-29 04:28:13 +00:00
dependabot-preview[bot]
b0bde9f73e
Bump node from 12.6-alpine to 12.7-alpine in /backend 
Bumps node from 12.6-alpine to 12.7-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-26 04:22:08 +00:00
dependabot-preview[bot]
b2bdc0b683
Bump metascraper-video from 4.10.2 to 5.6.3 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 4.10.2 to 5.6.3.
- [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/v4.10.2...v5.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-25 04:30:26 +00:00
dependabot-preview[bot]
f21aded626
Bump helmet from 3.19.0 to 3.20.0 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.19.0 to 3.20.0.
- [Release notes](https://github.com/helmetjs/helmet/releases)
- [Changelog](https://github.com/helmetjs/helmet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/helmetjs/helmet/compare/v3.19.0...v3.20.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-25 04:29:54 +00:00
mattwr18
6dbbd36c6f
Merge pull request #1102 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.6.3 
Bump metascraper-image from 4.10.2 to 5.6.3 in /backend
 2019-07-24 14:39:41 +02:00
mattwr18
485b961637
Merge pull request #1106 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.3 
Bump date-fns from 2.0.0-beta.1 to 2.0.0-beta.3 in /backend
 2019-07-24 10:20:48 +02:00
mattwr18
8841273b0e
Merge pull request #1105 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.6.3 
Bump metascraper-title from 4.10.2 to 5.6.3 in /backend
 2019-07-24 10:20:06 +02:00
mattwr18
abd2024949
Merge pull request #1103 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.6.3 
Bump metascraper-author from 4.10.2 to 5.6.3 in /backend
 2019-07-24 10:19:43 +02:00
dependabot-preview[bot]
67c7864533
Bump metascraper-image from 4.10.2 to 5.6.3 in /backend 
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 4.10.2 to 5.6.3.
- [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/v4.10.2...v5.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-24 08:08:19 +00:00
mattwr18
bcf70edffe
Merge pull request #1101 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.6.3 
Bump metascraper-lang from 4.10.2 to 5.6.3 in /backend
 2019-07-24 10:06:13 +02:00
mattwr18
e04a323b0d
Merge pull request #1100 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.13.6 
Bump eslint-plugin-jest from 22.13.0 to 22.13.6 in /backend
 2019-07-24 10:05:24 +02:00
dependabot-preview[bot]
c73bb068fb
Bump date-fns from 2.0.0-beta.1 to 2.0.0-beta.3 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.1 to 2.0.0-beta.3.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.0.0-beta.1...v2.0.0-beta.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-24 04:25:54 +00:00
dependabot-preview[bot]
b70760e670
Bump metascraper-title from 4.10.2 to 5.6.3 in /backend 
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 4.10.2 to 5.6.3.
- [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/v4.10.2...v5.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-24 04:25:06 +00:00