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

4279 Commits

Author SHA1 Message Date
dependabot-preview[bot]
5a46bd3a78
Bump metascraper-video from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-video](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5.
- [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.6.3...v5.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 14:34:40 +00:00
Robert Schäfer
a6aa974179 Merge remote-tracking branch 'origin/master' into storybook 2019-08-02 14:28:49 +02:00
Robert Schäfer
f1b28c83a0 Meld commits from master 2019-08-02 14:26:06 +02:00
Robert Schäfer
80833b847b
Merge pull request #1160 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.6.5 
Bump metascraper-date from 5.6.3 to 5.6.5 in /backend
 2019-08-02 12:58:20 +02:00
dependabot-preview[bot]
6c3a9878c7
Bump metascraper-date from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-date](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5.
- [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.6.3...v5.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 08:26:00 +00:00
dependabot-preview[bot]
87efc0ec56
Bump metascraper-publisher from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-publisher](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5.
- [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.6.3...v5.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 08:26:00 +00:00
Robert Schäfer
cc6583f1f9
Merge pull request #1162 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.6.5 
Bump metascraper-description from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:22:35 +02:00
Robert Schäfer
68491446c2
Merge pull request #1164 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.6.5 
Bump metascraper-soundcloud from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:22:07 +02:00
Robert Schäfer
25927f47d5
Merge pull request #1165 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-url-5.6.5 
Bump metascraper-url from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:21:50 +02:00
Robert Schäfer
3974025e79
Merge pull request #1166 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-audio-5.6.5 
Bump metascraper-audio from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:21:35 +02:00
Robert Schäfer
89dcbefcf4
Merge pull request #1167 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.6.5 
Bump metascraper-logo from 5.6.3 to 5.6.5 in /backend
 2019-08-02 10:21:18 +02:00
Robert Schäfer
5babde5062
Merge pull request #1032 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-standard-13.0.1 
Bump eslint-config-standard from 12.0.0 to 13.0.1 in /backend
 2019-08-02 10:20:44 +02:00
Matt Rider
76a720caec Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-02 08:02:54 +02:00
dependabot-preview[bot]
55fafc4bc8
Bump metascraper-logo from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-logo](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5.
- [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.6.3...v5.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 04:25:09 +00:00
dependabot-preview[bot]
be388c177a
Bump metascraper-audio from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5.
- [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.6.3...v5.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 04:24:29 +00:00
dependabot-preview[bot]
4613569334
Bump metascraper-url from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-url](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5.
- [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.6.3...v5.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 04:24:05 +00:00
dependabot-preview[bot]
819dac552d
Bump metascraper-soundcloud from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.6.3 to 5.6.5.
- [Release notes](https://github.com/microlinkhq/metascraper-soundcloud/releases)
- [Commits](https://github.com/microlinkhq/metascraper-soundcloud/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 04:23:31 +00:00
dependabot-preview[bot]
8da1d0b21b
Bump metascraper-description from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.6.3 to 5.6.5.
- [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.6.3...v5.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 04:22:35 +00:00
Robert Schäfer
e1bb6ed74e Fix lint 2019-08-02 01:45:36 +02:00
dependabot-preview[bot]
0a9991b979 Bump eslint-config-standard from 12.0.0 to 13.0.1 in /backend 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 12.0.0 to 13.0.1.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v12.0.0...v13.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 01:29:25 +02:00
Robert Schäfer
bc5189cbb8 Workaround neo4j-graphql-js issue 
See https://github.com/neo4j-graphql/neo4j-graphql-js/issues/265
 2019-08-02 01:14:09 +02:00
dependabot-preview[bot]
d5e41ae8d8
Bump neo4j-driver from 1.7.4 to 1.7.5 in /backend 
Bumps [neo4j-driver](https://github.com/neo4j/neo4j-javascript-driver) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/neo4j/neo4j-javascript-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-javascript-driver/compare/1.7.4...1.7.5)
 2019-08-01 13:37:07 +00:00
Matt Rider
fb9a632d55 Query a currentUsers emotions for a post, translations 2019-08-01 15:11:41 +02:00
Robert Schäfer
fdef9db74f Update metascraper-youtube 2019-08-01 14:19:24 +02:00
Robert Schäfer
78105b1c66
Merge pull request #1149 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.8.1 
Bump apollo-server from 2.8.0 to 2.8.1 in /backend
 2019-08-01 14:15:43 +02:00
dependabot-preview[bot]
9b8e0ab03e
Bump apollo-server from 2.8.0 to 2.8.1 in /backend 
Bumps [apollo-server](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@2.8.0...apollo-server@2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-01 10:47:44 +00:00
Robert Schäfer
d92dffad25
Merge pull request #1146 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.8.1 
Bump apollo-server-testing from 2.8.0 to 2.8.1 in /backend
 2019-08-01 12:47:33 +02:00
Robert Schäfer
bf90309835
Merge pull request #1148 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.14.1 
Bump eslint-plugin-jest from 22.14.0 to 22.14.1 in /backend
 2019-08-01 12:47:07 +02:00
Robert Schäfer
0a142bbfd9
Merge pull request #1151 from Human-Connection/dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.7.0 
Bump merge-graphql-schemas from 1.6.1 to 1.7.0 in /backend
 2019-08-01 12:46:06 +02:00
Robert Schäfer
656b8bbb05
Merge pull request #1154 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.8.1 
Bump apollo-server-express from 2.8.0 to 2.8.1 in /backend
 2019-08-01 12:45:37 +02:00
Robert Schäfer
b6a59460bd Merge remote-tracking branch 'origin/master' into storybook 2019-08-01 12:22:09 +02:00
Robert Schäfer
c9e6d182ec Followed @mattwr18's suggestions here: 
https://github.com/Human-Connection/Human-Connection/pull/952#pullrequestreview-269406016
 2019-08-01 12:20:33 +02:00
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