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

4402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wolfgang Huß
00879fc2fa Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 256-editor-embeds-merge-in-nitro-embed 
# Conflicts:
#	backend/package.json
#	backend/yarn.lock
 2019-07-22 10:51:23 +02:00
mattwr18
40041f108d
Merge pull request #1095 from Human-Connection/dependabot/npm_and_yarn/backend/babel/core-7.5.5 
Bump @babel/core from 7.5.4 to 7.5.5 in /backend
 2019-07-22 05:37:04 -03:00
mattwr18
ef7f7a934e
Merge pull request #1093 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.18.2 
Bump eslint-plugin-import from 2.18.0 to 2.18.2 in /webapp
 2019-07-22 05:36:46 -03:00
mattwr18
f94703ae4a
Merge pull request #1085 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.13.0 
Bump eslint-plugin-jest from 22.11.1 to 22.13.0 in /backend
 2019-07-22 05:34:04 -03:00
mattwr18
1b508258ec
Merge pull request #1084 from Human-Connection/dependabot/npm_and_yarn/neode-0.2.18 
Bump neode from 0.2.16 to 0.2.18
 2019-07-22 05:33:28 -03:00
mattwr18
8b7ecabe18
Merge pull request #1083 from Human-Connection/dependabot/npm_and_yarn/backend/merge-graphql-schemas-1.6.1 
Bump merge-graphql-schemas from 1.5.8 to 1.6.1 in /backend
 2019-07-22 05:33:01 -03:00
dependabot-preview[bot]
c5604038d1
Bump @babel/core from 7.5.4 to 7.5.5 in /backend 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.4 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 04:54:16 +00:00
dependabot-preview[bot]
b9eae65b8b
Bump eslint-plugin-import from 2.18.0 to 2.18.2 in /webapp 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.0 to 2.18.2.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.18.0...v2.18.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 04:51:16 +00:00
dependabot-preview[bot]
bbe071d021
Bump eslint-plugin-jest from 22.11.1 to 22.13.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.11.1 to 22.13.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.11.1...v22.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 04:44:09 +00:00
dependabot-preview[bot]
420ea7e810
Bump neode from 0.2.16 to 0.2.18 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.2.16 to 0.2.18.
- [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-07-22 04:42:26 +00:00
dependabot-preview[bot]
cdc6fbc1c1
Bump merge-graphql-schemas from 1.5.8 to 1.6.1 in /backend 
Bumps [merge-graphql-schemas](https://github.com/Urigo/merge-graphql-schemas) from 1.5.8 to 1.6.1.
- [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)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-22 04:41:42 +00:00
Robert Schäfer
f8df0eabf9 Remove obsolete kubernetes configuration 2019-07-22 00:42:56 +02:00
Robert Schäfer
db1ca5767a Remove unnecessary got module 2019-07-22 00:40:12 +02:00
Robert Schäfer
4ee20d4e7e Coerce undefinedToNull in embed resolver 2019-07-22 00:38:56 +02:00
Robert Schäfer
c5789cbf90 Fix get-video-id expects a string bug 2019-07-22 00:20:43 +02:00
Robert Schäfer
657a5ac1f5 Fix resolve function returns undefind 
I'm also trying to make sense of the attribute `sources` - probably it's
indicating where the data is coming from.
 2019-07-21 23:31:44 +02:00
Robert Schäfer
3d7a30d419 Remove metascraper-logo-favicon altogether 
It's doing http requests which are hard to test and hard to maintain.
Therefore let's remove it until we really need it.
 2019-07-21 22:20:44 +02:00
Robert Schäfer
75743cae32 Passing jest test, not all requests stubbed out 2019-07-21 13:41:39 +02:00
Robert Schäfer
d7d2c2ef06 Add npm script to run tests without http servers 
Remove this script once we refactored all tests to use
`apollo-server-testing`.
 2019-07-21 12:41:21 +02:00
Robert Schäfer
579ec7e7dc Re-add embed attribute as html 2019-07-20 17:51:20 +02:00
Robert Schäfer
f5730fce7e Start to mock+test embeds resolver 
+ Put oembed providers into a file
+ Add test snapshots
+ Remove unnecessary request-native dependency
 2019-07-20 17:47:18 +02:00
Robert Schäfer
d81c38c4e3 Remove obscure embed attribute and remove cache 
The cache is a possible memory leak: It grows over time and never gets
cleaned.
 2019-07-20 15:58:55 +02:00
Robert Schäfer
7a9d9339f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 256-editor-embeds-merge-in-nitro-embed 2019-07-20 14:45:41 +02:00
Robert Schäfer
d901432f7f
Merge pull request #1073 from Human-Connection/dependabot/npm_and_yarn/backend/babel/preset-env-7.5.5 
Bump @babel/preset-env from 7.5.4 to 7.5.5 in /backend
 2019-07-20 14:38:47 +02:00
Robert Schäfer
fc44dfd58d
Merge pull request #1075 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/preset-env-7.5.5 
Bump @babel/preset-env from 7.5.4 to 7.5.5 in /webapp
 2019-07-20 14:38:30 +02:00
Robert Schäfer
73e879eb68 Fix lint 2019-07-19 22:29:53 +02:00
Robert Schäfer
17ccbcefa6 Remove embed service from docker-compose.yml 2019-07-19 22:03:49 +02:00
Robert Schäfer
f82b2c37b3 Refactor scraper.js with ES6 imports 2019-07-19 21:29:07 +02:00
Robert Schäfer
2e6ea62144 Replace got with node-fetch => -1 dependency 2019-07-19 21:06:05 +02:00
Robert Schäfer
d4c3b7ac10 Merge embed service with backend 2019-07-19 20:32:53 +02:00
Robert Schäfer
b3712d9e11 Merge remote-tracking branch 'origin/master' into 256-editor-embeds-merge-in-nitro-embed 2019-07-19 20:18:10 +02:00
dependabot-preview[bot]
5d8f1b0a12
Bump @babel/preset-env from 7.5.4 to 7.5.5 in /backend 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.4 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 18:14:49 +00:00
dependabot-preview[bot]
b29a15db7f
Bump @babel/preset-env from 7.5.4 to 7.5.5 in /webapp 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.4 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 18:14:44 +00:00
Robert Schäfer
f5b8470dc0
Merge pull request #1061 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.4 
Bump graphql-shield from 6.0.3 to 6.0.4 in /backend
 2019-07-19 20:13:25 +02:00
Robert Schäfer
917178c6c3
Merge pull request #1058 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.7.0 
Bump apollo-server from 2.6.9 to 2.7.0 in /backend
 2019-07-19 20:13:14 +02:00
Robert Schäfer
7896ae0e29
Merge pull request #1074 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.5.5 
Bump @babel/node from 7.5.0 to 7.5.5 in /backend
 2019-07-19 20:12:37 +02:00
Robert Schäfer
a56dded667
Merge pull request #1080 from Human-Connection/1003-Page-for-Imprint 
Created imprint page, added English translations
 2019-07-19 15:25:20 +02:00
dependabot-preview[bot]
69515da97e
Bump graphql-shield from 6.0.3 to 6.0.4 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 6.0.3 to 6.0.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v6.0.3...v6.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 13:22:55 +00:00
dependabot-preview[bot]
42bde5661b
Bump apollo-server from 2.6.9 to 2.7.0 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.6.9 to 2.7.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.6.9...apollo-server@2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 13:22:53 +00:00
dependabot-preview[bot]
7c6d915954
Bump @babel/node from 7.5.0 to 7.5.5 in /backend 
Bumps [@babel/node](https://github.com/babel/babel) from 7.5.0 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 13:22:37 +00:00
Robert Schäfer
65d1be289d
Merge pull request #1072 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.19.0 
Bump helmet from 3.18.0 to 3.19.0 in /backend
 2019-07-19 15:21:00 +02:00
Robert Schäfer
ebeec29d3e
Merge pull request #1070 from Human-Connection/dependabot/npm_and_yarn/backend/babel/register-7.5.5 
Bump @babel/register from 7.4.4 to 7.5.5 in /backend
 2019-07-19 15:20:40 +02:00
Robert Schäfer
949b839a9f
Merge pull request #1076 from Human-Connection/dependabot/npm_and_yarn/webapp/babel/core-7.5.5 
Bump @babel/core from 7.5.4 to 7.5.5 in /webapp
 2019-07-19 15:19:45 +02:00
Robert Schäfer
48c380d5b1
Merge pull request #1078 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.11.1 
Bump eslint-plugin-jest from 22.9.0 to 22.11.1 in /backend
 2019-07-19 15:19:26 +02:00
Robert Schäfer
e10ed996bb
Merge pull request #1079 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.11.1 
Bump eslint-plugin-jest from 22.9.0 to 22.11.1 in /webapp
 2019-07-19 15:19:02 +02:00
ogerly
66ea9f7a55 English adapted, lint ok 2019-07-19 06:55:18 +02:00
dependabot-preview[bot]
847c2f90f6
Bump eslint-plugin-jest from 22.9.0 to 22.11.1 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.9.0 to 22.11.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.9.0...v22.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 04:30:34 +00:00
dependabot-preview[bot]
c940268bf4
Bump eslint-plugin-jest from 22.9.0 to 22.11.1 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.9.0 to 22.11.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.9.0...v22.11.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 04:30:29 +00:00
dependabot-preview[bot]
c183401bb4
Bump @babel/core from 7.5.4 to 7.5.5 in /webapp 
Bumps [@babel/core](https://github.com/babel/babel) from 7.5.4 to 7.5.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-18 15:57:36 +00:00
dependabot-preview[bot]
7b07170792
Bump helmet from 3.18.0 to 3.19.0 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.18.0 to 3.19.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.18.0...v3.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-18 15:54:59 +00:00