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

4878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander Friedland
4fe3c08402
Merge branch 'master' into 375-Sorting-II 2019-07-19 11:53:01 +02:00
ogerly
063479610e fix lint 2019-07-19 10:28:13 +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
ogerly
6e5b277afa commentar delete 2019-07-18 21:19:15 +02:00
ogerly
0666dba321 Merge branch '806-HcContributionForm-submit-is-not-disabled-by-default' of https://github.com/Human-Connection/Human-Connection into 806-HcContributionForm-submit-is-not-disabled-by-default 2019-07-18 21:07:24 +02:00
ogerly
18fcfb0fd0 Change of css and variables, lint and test ok 2019-07-18 21:06:01 +02: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
dependabot-preview[bot]
91fa969ea5
Bump @babel/register from 7.4.4 to 7.5.5 in /backend 
Bumps [@babel/register](https://github.com/babel/babel) from 7.4.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.4.4...v7.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-18 15:54:10 +00:00
Matt Rider
5fb89fd45c Merge branch 'master' of github.com:Human-Connection/Human-Connection into refine-social-media 2019-07-17 07:23:29 -03:00
mattwr18
9237f24b68
Merge pull request #1060 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.9.0 
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /backend
 2019-07-17 07:08:39 -03:00
mattwr18
e4d4be448a
Merge pull request #1057 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.9.0 
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /webapp
 2019-07-17 07:06:43 -03:00
mattwr18
fcfa4722df
Merge pull request #1056 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.7.0 
Bump apollo-server-testing from 2.6.9 to 2.7.0 in /backend
 2019-07-17 07:06:22 -03:00
mattwr18
0313698b00
Merge pull request #1055 from Human-Connection/dependabot/npm_and_yarn/cypress-file-upload-3.3.2 
Bump cypress-file-upload from 3.3.1 to 3.3.2
 2019-07-17 07:06:01 -03:00
Wolfgang Huß
e0ab41a3d1
Merge pull request #788 from Human-Connection/552-update_comment 
Update comment
 2019-07-17 10:36:53 +02:00
ogerly
47324d4905 example II - lint ok, test local ok 2019-07-17 09:57:08 +02:00
Wolfgang Huß
f7da4a2bdf Rewrite the Backend test that are doublets to make sense 2019-07-17 09:26:03 +02:00
dependabot-preview[bot]
2342f984ce
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.8.0 to 22.9.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.8.0...v22.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:27:48 +00:00
dependabot-preview[bot]
d4a054a5e2
Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in /webapp 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.8.0 to 22.9.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.8.0...v22.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:26:22 +00:00
dependabot-preview[bot]
5430a5e990
Bump apollo-server-testing from 2.6.9 to 2.7.0 in /backend 
Bumps [apollo-server-testing](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-testing@2.6.9...apollo-server-testing@2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:25:49 +00:00
dependabot-preview[bot]
0f91cced24
Bump cypress-file-upload from 3.3.1 to 3.3.2 
Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 04:25:09 +00:00
Robert Schäfer
b74590821c Merge remote-tracking branch 'origin/master' into 256-editor-embeds-merge-in-nitro-embed 2019-07-16 21:33:46 +02:00
Robert Schäfer
7de73f861e
Merge pull request #1044 from Human-Connection/refactor_email_address 
Refactoring: Split User and Email
 2019-07-16 21:28:42 +02:00
Robert Schäfer
1970baaa2d Apparently neode doesn't like multiple connections 
Why? 😟
 2019-07-16 21:05:44 +02:00
Robert Schäfer
95d26a701c Fix lint 2019-07-16 21:00:47 +02:00
Robert Schäfer
99bfd56ea7 Merge remote-tracking branch 'origin/master' into refactor_email_address 2019-07-16 20:20:21 +02:00
Robert Schäfer
4c9dbdb378 Refactor changePassword resolver with neode 2019-07-16 20:06:26 +02:00
Matt Rider
1c53c58f42 Add backend validation tests to expose non-validation 
- remove validation/index.js as it's not being used
- move validations to validationMiddleware.js where it validates
 2019-07-16 14:54:13 -03:00
Matt Rider
16f077fe65 Add authentication tests for AddPostEmotions, emotionsCount 2019-07-16 11:02:43 -03:00
Wolfgang Huß
3b88c47206 Update the contentExcerpt 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-16 15:48:38 +02:00
Wolfgang Huß
e4fd7f4cf7 Merge branch '552-update_comment' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:11:41 +02:00
Wolfgang Huß
fae5b11607 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-07-16 15:09:50 +02:00
Alina Beck
972425fb09 fix lint errors 2019-07-16 14:00:30 +02:00
Alina Beck
c2887c7b90 add integration test for editing social media 2019-07-16 13:06:34 +02:00
Matt Rider
a019c8c311 Revert unintended changes, refactor 
- rename some variables in comments.spec.js while dealing with merge conflicts
- rename EditCommentForm/index.vue with new naming convention
- add comment to explain absense of <no-ssr>
- use a comments content for edit comment form content, not excerpt
 2019-07-16 07:53:57 -03:00