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

4261 Commits

Author SHA1 Message Date
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
Matt Rider
ced676d315 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-08 14:06:45 +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
fd022c7992 Fix mentions in seeds 2019-08-08 10:19:38 +02:00
Matt Rider
b6975bde89 Add data-mention-id to seeds mentions 2019-08-08 10:07:57 +02:00
Matt Rider
21aa729edb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-08 09:10:18 +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
Wolfgang Huß
22b9bf77fa Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/schema/resolvers/notifications.spec.js
 2019-08-05 10:15:20 +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
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