Alexander Friedland
|
f784759434
|
delete .vscode / settings.json
delete .vscode / settings.json
|
2020-01-15 08:34:49 +01:00 |
|
ogerly
|
af760c17ea
|
Merge branch '1188-Delete_teaser_image' of https://github.com/Human-Connection/Human-Connection into 1188-Delete_teaser_image
|
2020-01-06 11:07:46 +01:00 |
|
ogerly
|
f8c0a34194
|
Proposed changes accepted and incorporated
|
2020-01-06 11:06:59 +01:00 |
|
Alexander Friedland
|
cd8b244741
|
Update webapp/components/ContributionForm/ContributionForm.vue
showDeleteButton change
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
|
2020-01-06 10:57:48 +01:00 |
|
ogerly
|
3599825436
|
merge master
|
2020-01-06 10:52:16 +01:00 |
|
ogerly
|
e61387bc5a
|
change settings and rmove gitignore
|
2020-01-06 10:48:17 +01:00 |
|
ogerly
|
f06b04178f
|
add vscode settings.json to gitignore
|
2020-01-06 10:43:32 +01:00 |
|
Alexander Friedland
|
d38a1f089f
|
Merge branch 'master' into 1188-Delete_teaser_image
|
2019-12-19 18:26:05 +01:00 |
|
ogerly
|
b9676271ea
|
Delete teaser image
|
2019-12-19 17:46:25 +01:00 |
|
Robert Schäfer
|
8d6205a865
|
Merge pull request #2556 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-image-5.8.12
build(deps): bump metascraper-image from 5.8.10 to 5.8.12 in /backend
|
2019-12-19 13:31:02 +01:00 |
|
Robert Schäfer
|
96d3cb1d0b
|
Merge pull request #2569 from Human-Connection/dependabot/npm_and_yarn/babel/core-7.7.7
build(deps-dev): bump @babel/core from 7.7.5 to 7.7.7
|
2019-12-19 13:28:36 +01:00 |
|
Robert Schäfer
|
a21f7a9730
|
Merge pull request #2576 from Human-Connection/dependabot/npm_and_yarn/backend/babel/cli-7.7.7
build(deps-dev): bump @babel/cli from 7.7.5 to 7.7.7 in /backend
|
2019-12-19 13:28:15 +01:00 |
|
mattwr18
|
efd4d1f2af
|
Merge pull request #2563 from Human-Connection/lokalise-2019-12-18_10-06-16
Lokalise: Translations update
|
2019-12-19 12:27:04 +01:00 |
|
mattwr18
|
a5542c5b4c
|
Merge pull request #2580 from Human-Connection/dependabot/npm_and_yarn/webapp/style-resources-loader-1.3.3
build(deps-dev): bump style-resources-loader from 1.3.2 to 1.3.3 in /webapp
|
2019-12-19 12:13:52 +01:00 |
|
mattwr18
|
8f5dbe60c0
|
Merge pull request #2577 from Human-Connection/dependabot/docker/webapp/node-13.4.0-alpine
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp
|
2019-12-19 11:49:38 +01:00 |
|
mattwr18
|
6f02ac6b74
|
Merge pull request #2575 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-title-5.8.12
build(deps): bump metascraper-title from 5.8.10 to 5.8.12 in /backend
|
2019-12-19 11:48:56 +01:00 |
|
mattwr18
|
679f95d5a7
|
Merge pull request #2574 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.14
build(deps-dev): bump apollo-server-testing from 2.9.13 to 2.9.14 in /backend
|
2019-12-19 11:48:40 +01:00 |
|
dependabot-preview[bot]
|
f06c3a0db4
|
build(deps-dev): bump @babel/cli from 7.7.5 to 7.7.7 in /backend
Bumps [@babel/cli](https://github.com/babel/babel) from 7.7.5 to 7.7.7.
- [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.7.5...v7.7.7)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 10:48:24 +00:00 |
|
mattwr18
|
9b09ff16a2
|
Merge pull request #2572 from Human-Connection/dependabot/npm_and_yarn/backend/mustache-3.2.0
build(deps): bump mustache from 3.1.0 to 3.2.0 in /backend
|
2019-12-19 11:48:11 +01:00 |
|
dependabot-preview[bot]
|
95dfbe4a43
|
build(deps-dev): bump @babel/core from 7.7.5 to 7.7.7
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.5 to 7.7.7.
- [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.7.5...v7.7.7)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 10:48:03 +00:00 |
|
Wolfgang Huß
|
377f2eecd2
|
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content
Blur Images
|
2019-12-19 11:46:38 +01:00 |
|
mattwr18
|
83489ef994
|
Merge pull request #2570 from Human-Connection/dependabot/npm_and_yarn/backend/babel/node-7.7.7
build(deps-dev): bump @babel/node from 7.7.4 to 7.7.7 in /backend
|
2019-12-19 11:46:06 +01:00 |
|
dependabot-preview[bot]
|
a0c34180a8
|
build(deps): bump metascraper-image from 5.8.10 to 5.8.12 in /backend
Bumps [metascraper-image](https://github.com/microlinkhq/metascraper) from 5.8.10 to 5.8.12.
- [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.8.10...v5.8.12)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 10:42:27 +00:00 |
|
mattwr18
|
0128fe0d96
|
Merge pull request #2567 from Human-Connection/dependabot/npm_and_yarn/babel/preset-env-7.7.7
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7
|
2019-12-19 11:42:08 +01:00 |
|
mattwr18
|
ef2959b531
|
Merge pull request #2566 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-description-5.8.12
build(deps): bump metascraper-description from 5.8.10 to 5.8.12 in /backend
|
2019-12-19 11:40:26 +01:00 |
|
dependabot-preview[bot]
|
ffa6825f06
|
build(deps-dev): bump style-resources-loader in /webapp
Bumps [style-resources-loader](https://github.com/yenshih/style-resources-loader) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/yenshih/style-resources-loader/releases)
- [Changelog](https://github.com/yenshih/style-resources-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yenshih/style-resources-loader/commits)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 04:21:36 +00:00 |
|
dependabot-preview[bot]
|
3816e79b6d
|
build(deps): bump node from 13.3.0-alpine to 13.4.0-alpine in /webapp
Bumps node from 13.3.0-alpine to 13.4.0-alpine.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 04:20:21 +00:00 |
|
dependabot-preview[bot]
|
0fcc59411f
|
build(deps): bump metascraper-title from 5.8.10 to 5.8.12 in /backend
Bumps [metascraper-title](https://github.com/microlinkhq/metascraper) from 5.8.10 to 5.8.12.
- [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.8.10...v5.8.12)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 04:19:35 +00:00 |
|
dependabot-preview[bot]
|
e3d51f044d
|
build(deps-dev): bump apollo-server-testing in /backend
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.13 to 2.9.14.
- [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.9.13...apollo-server-testing@2.9.14)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 04:19:17 +00:00 |
|
dependabot-preview[bot]
|
4b5bf21d06
|
build(deps): bump mustache from 3.1.0 to 3.2.0 in /backend
Bumps [mustache](https://github.com/janl/mustache.js) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/janl/mustache.js/releases)
- [Changelog](https://github.com/janl/mustache.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/janl/mustache.js/compare/v3.1.0...v3.2.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 04:18:39 +00:00 |
|
dependabot-preview[bot]
|
8f53ea500d
|
build(deps-dev): bump @babel/node from 7.7.4 to 7.7.7 in /backend
Bumps [@babel/node](https://github.com/babel/babel) from 7.7.4 to 7.7.7.
- [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.7.4...v7.7.7)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 04:18:10 +00:00 |
|
dependabot-preview[bot]
|
f6f89ae803
|
build(deps-dev): bump @babel/preset-env from 7.7.6 to 7.7.7
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.6 to 7.7.7.
- [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.7.6...v7.7.7)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 04:17:30 +00:00 |
|
dependabot-preview[bot]
|
855e147381
|
build(deps): bump metascraper-description in /backend
Bumps [metascraper-description](https://github.com/microlinkhq/metascraper) from 5.8.10 to 5.8.12.
- [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.8.10...v5.8.12)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-19 04:17:16 +00:00 |
|
ogerly
|
779e8e6e7a
|
Merge branch '1746-Blur_explicit_Image_Content' of https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content
|
2019-12-18 16:45:48 +01:00 |
|
ogerly
|
d2a17373b0
|
last step ?
|
2019-12-18 16:43:24 +01:00 |
|
mattwr18
|
57a4309b30
|
Merge pull request #2544 from Human-Connection/2543-add-back-layout-changes
Add back layout changes/update db_manipulation
|
2019-12-18 16:16:00 +01:00 |
|
mattwr18
|
2de3ea8e1d
|
Merge pull request #2560 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-soundcloud-5.8.12
build(deps): bump metascraper-soundcloud from 5.8.10 to 5.8.12 in /backend
|
2019-12-18 16:15:53 +01:00 |
|
mattwr18
|
557253de31
|
Merge pull request #2559 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-author-5.8.12
build(deps): bump metascraper-author from 5.8.7 to 5.8.12 in /backend
|
2019-12-18 16:15:36 +01:00 |
|
mattwr18
|
c19cbf6131
|
Merge pull request #2558 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-5.8.12
build(deps): bump metascraper from 5.8.9 to 5.8.12 in /backend
|
2019-12-18 16:15:21 +01:00 |
|
mattwr18
|
ada30d4880
|
Merge pull request #2547 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-youtube-5.8.12
build(deps): bump metascraper-youtube from 5.8.9 to 5.8.12 in /backend
|
2019-12-18 16:15:04 +01:00 |
|
mattwr18
|
e002ed0b49
|
Add back layout changes/update db_manipulation
- we had removed these changes till we could deploy them by themselves
and run the db_manipulation
Co-authored-by: Alina Beck <alina.beck@mail.com>
|
2019-12-18 15:39:42 +01:00 |
|
Alina Beck
|
2e26e3f3f9
|
Apply suggestions from code review
change FAQ link text
|
2019-12-18 17:36:24 +05:30 |
|
dependabot-preview[bot]
|
705b781681
|
build(deps): bump metascraper from 5.8.9 to 5.8.12 in /backend
Bumps [metascraper](https://github.com/microlinkhq/metascraper) from 5.8.9 to 5.8.12.
- [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.8.9...v5.8.12)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-18 10:41:31 +00:00 |
|
dependabot-preview[bot]
|
5731b0381c
|
build(deps): bump metascraper-soundcloud in /backend
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.8.10 to 5.8.12.
- [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-12-18 10:41:29 +00:00 |
|
dependabot-preview[bot]
|
fbbb23b313
|
build(deps): bump metascraper-youtube from 5.8.9 to 5.8.12 in /backend
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.8.9 to 5.8.12.
- [Release notes](https://github.com/microlinkhq/metascraper-youtube/releases)
- [Commits](https://github.com/microlinkhq/metascraper-youtube/commits)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-18 10:41:27 +00:00 |
|
mattwr18
|
6b049b52db
|
Merge pull request #2557 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-video-5.8.12
build(deps): bump metascraper-video from 5.8.10 to 5.8.12 in /backend
|
2019-12-18 11:39:16 +01:00 |
|
dependabot-preview[bot]
|
b1a449b6a5
|
build(deps): bump metascraper-author from 5.8.7 to 5.8.12 in /backend
Bumps [metascraper-author](https://github.com/microlinkhq/metascraper) from 5.8.7 to 5.8.12.
- [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.8.7...v5.8.12)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-12-18 10:35:13 +00:00 |
|
mattwr18
|
8507658416
|
Merge pull request #2555 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-date-5.8.12
build(deps): bump metascraper-date from 5.8.7 to 5.8.12 in /backend
|
2019-12-18 11:33:30 +01:00 |
|
mattwr18
|
356aa578af
|
Merge pull request #2554 from Human-Connection/dependabot/npm_and_yarn/backend/metascraper-logo-5.8.12
build(deps): bump metascraper-logo from 5.8.10 to 5.8.12 in /backend
|
2019-12-18 11:33:10 +01:00 |
|
mattwr18
|
46c5194637
|
Merge pull request #2551 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-express-2.9.14
build(deps): bump apollo-server-express from 2.9.13 to 2.9.14 in /backend
|
2019-12-18 11:32:51 +01:00 |
|