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

861 Commits

Author SHA1 Message Date
dependabot-preview[bot]
b56cabb8a4
Bump eslint-plugin-jest from 22.15.0 to 22.15.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.0 to 22.15.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.15.0...v22.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 04:22:43 +00:00
dependabot-preview[bot]
e34c7f196f
Bump apollo-cache-inmemory from 1.6.2 to 1.6.3 in /backend 
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.6.2 to 1.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.6.2...apollo-cache-inmemory@1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 14:58:45 +00:00
dependabot-preview[bot]
0fa3333d86
Bump apollo-client from 2.6.3 to 2.6.4 in /backend 
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.3...apollo-client@2.6.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-12 04:28:25 +00:00
Robert Schäfer
425b53a53f
Merge pull request #1228 from Human-Connection/dependabot/docker/backend/node-12.8-alpine 
Bump node from 12.7-alpine to 12.8-alpine in /backend
 2019-08-09 11:57:50 +02:00
Wolfgang Huß
bf92a88bf9
Merge pull request #1223 from Human-Connection/remove-mocks 
Remove obsolete "MOCKS"
 2019-08-09 10:31:42 +02:00
dependabot-preview[bot]
f9bb12f0af
Bump node from 12.7-alpine to 12.8-alpine in /backend 
Bumps node from 12.7-alpine to 12.8-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-09 04:31:08 +00:00
Robert Schäfer
2eaf66378a
Merge pull request #1133 from Human-Connection/384-emotions-on-posts 
Emotions on posts
 2019-08-09 00:37:38 +02:00
Robert Schäfer
963cbbef32 RemovePostEmotions should return deleted object 
@mattwr18 I prefer (I believe it's even best practice) that a delete
mutation should return the deleted object. If you run the delete
mutation again, it should return `null` because there is no object like
that anymore. That way the client knows if a delete mutation has changed
any state in the database.

Also I fixed another bug in the resolver. If your graphql mutation looks
like this:

```gql
mutation {
  RemovePostEmotions(to:{ id:"p15"}, data:{emotion: angry}) {
    from {
      id
      name
    }
    to {
      id
      title
    }
    emotion
  }
}
```

Then you get errors because your resolver does not return the name for
the user or the title for the post anymore. Just use spread operator...
and it's fixed.
 2019-08-08 23:51:26 +02:00
Robert Schäfer
f3e545a913 Fix bug: Only add emotions for authenticated user 2019-08-08 23:10:01 +02:00
Robert Schäfer
ff7143dcb1 Remove obsolete "MOCKS" 
It's unused code after all and I think we can improve the code base by
removing confusing code.
 2019-08-08 20:18:32 +02:00
Robert Schäfer
e1ba51a3ec
Merge pull request #1218 from Human-Connection/fix-mentions-in-seeds 
Add data-mention-id to seeds mentions
 2019-08-08 10:54:18 +02:00
Matt Rider
b6975bde89 Add data-mention-id to seeds mentions 2019-08-08 10:07:57 +02:00
dependabot-preview[bot]
34a4db78f6
Bump eslint-plugin-jest from 22.14.1 to 22.15.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.14.1 to 22.15.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.14.1...v22.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 04:26:59 +00:00
Matt Rider
39a94a8aac Refactor 
- follow PR review by @roschaefer
 2019-08-07 14:55:32 +02:00
Matt Rider
1c0112e9d8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-06 19:00:14 +02:00
Matt Rider
b8e1ae0a1c Update user ids 2019-08-06 18:57:27 +02:00
Matt Rider
53af29b5a2 Refactor backend tests 
- to use neode and apollo-server-testing
 2019-08-06 18:26:39 +02:00
Robert Schäfer
d80a1adf83
Merge pull request #1195 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.4 
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /backend
 2019-08-06 15:40:30 +02:00
Matt Rider
d795ee50a9 Add backend tests for custom queries 2019-08-06 10:58:30 +02:00
Matt Rider
1593eab9cf Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-06 08:07:39 +02:00
Matt Rider
cb7217f5a7 Fix bug 
- apollo query fetchPolicy set to no-cache so that it will refetch a post's emotions count on page transition
 2019-08-06 08:05:35 +02:00
dependabot-preview[bot]
5a15e371d1
Bump neode from 0.3.0 to 0.3.1 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 05:52:14 +00:00
Wolfgang Huß
e8d5bed901
Merge pull request #952 from Human-Connection/storybook 
Storybook
 2019-08-06 07:50:09 +02:00
dependabot-preview[bot]
8080e38d1b
Bump date-fns from 2.0.0-beta.3 to 2.0.0-beta.4 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.3 to 2.0.0-beta.4.
- [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.3...v2.0.0-beta.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-06 04:23:35 +00:00
Robert Schäfer
20ef7e0c83
Merge pull request #1182 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-lang-5.6.5 
Bump metascraper-lang from 5.6.3 to 5.6.5 in /backend
 2019-08-05 13:16:08 +02:00
Robert Schäfer
1aeb93f9fb Merge remote-tracking branch 'origin/master' into storybook 2019-08-05 12:47:46 +02:00
Matt Rider
295b7e7769 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-05 09:50:54 +02:00
Matt Rider
97ff2e9457 Make emotionsArray a const, fix lint 2019-08-05 09:50:25 +02:00
dependabot-preview[bot]
213a138f99
Bump metascraper-lang from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-lang](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-05 07:45:13 +00:00
mattwr18
1ad8d7aa93
Merge pull request #1180 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.6.5 
Bump metascraper-author from 5.6.3 to 5.6.5 in /backend
 2019-08-05 09:44:18 +02:00
mattwr18
05036c2e23
Merge pull request #1178 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.6.5 
Bump metascraper-title from 5.6.3 to 5.6.5 in /backend
 2019-08-05 09:43:20 +02:00
dependabot-preview[bot]
562e6dbce7
Bump metascraper-author from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-author](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-05 04:27:43 +00:00
dependabot-preview[bot]
8f4bdf3b48
Bump metascraper-title from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-title](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-05 04:27:02 +00:00
dependabot-preview[bot]
5a52343247
Bump metascraper-image from 5.6.3 to 5.6.5 in /backend 
Bumps [metascraper-image](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-05 04:26:20 +00:00
Robert Schäfer
26958f6641 Explicitly disallow User.name == null in model 2019-08-03 00:43:18 +02:00
dependabot-preview[bot]
ab567663e9 Bump neode from 0.2.16 to 0.3.0 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.2.16 to 0.3.0.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-02 23:24:27 +02:00
Matt Rider
d1d82a0051 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-02 16:55:54 +02:00
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