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

1027 Commits

Author SHA1 Message Date
ogerly
1b9303ceaf Jest tests for the Terms and Conditions in frontend and backend 2019-09-03 09:46:18 +02:00
ogerly
f28ff69f3a Adaptation of Cypress tests, first attempt 2019-08-30 06:54:25 +02:00
ogerly
c09e9a0149 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-08-29 13:45:12 +02:00
Robert Schäfer
c69f05da61
Merge pull request #1424 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.1 
Bump apollo-server from 2.9.0 to 2.9.1 in /backend
 2019-08-29 12:19:32 +02:00
Robert Schäfer
29f4f1e662
Merge pull request #1416 from Human-Connection/dependabot/npm_and_yarn/backend/helmet-3.20.1 
Bump helmet from 3.20.0 to 3.20.1 in /backend
 2019-08-29 10:47:32 +02:00
dependabot-preview[bot]
14efc0ac8f
Bump apollo-server from 2.9.0 to 2.9.1 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.0 to 2.9.1.
- [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.9.0...apollo-server@2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 08:46:29 +00:00
Robert Schäfer
3b9b28ecf2
Merge pull request #1420 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-standard-14.1.0 
Bump eslint-config-standard from 14.0.1 to 14.1.0 in /backend
 2019-08-29 10:45:08 +02:00
Robert Schäfer
9a680f34e0
Merge pull request #1419 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.7.2 
Bump neo4j-graphql-js from 2.7.1 to 2.7.2 in /backend
 2019-08-29 10:44:51 +02:00
dependabot-preview[bot]
215c160b7c
Bump eslint-config-standard from 14.0.1 to 14.1.0 in /backend 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 14.0.1 to 14.1.0.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v14.0.1...v14.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 04:24:20 +00:00
dependabot-preview[bot]
b6dd2d3807
Bump neo4j-graphql-js from 2.7.1 to 2.7.2 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 04:23:41 +00:00
dependabot-preview[bot]
ba698ba4c4
Bump apollo-server-testing from 2.9.0 to 2.9.1 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.0 to 2.9.1.
- [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.0...apollo-server-testing@2.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 04:23:11 +00:00
dependabot-preview[bot]
260f13e4a3
Bump helmet from 3.20.0 to 3.20.1 in /backend 
Bumps [helmet](https://github.com/helmetjs/helmet) from 3.20.0 to 3.20.1.
- [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.20.0...v3.20.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 04:22:40 +00:00
Robert Schäfer
1f1c474baf
Merge pull request #1388 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.2.2 
Bump eslint from 6.2.1 to 6.2.2 in /backend
 2019-08-28 19:38:28 +02:00
ogerly
ee03f0e902 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into C-1187-terms-and-conditions-confirmed-function 2019-08-28 14:21:46 +02:00
Robert Schäfer
8a729122c3
Merge pull request #1270 from Human-Connection/1062-notification-about-comment-on-post 
🍰 1062 notification about comment on post
 2019-08-27 15:59:46 +02:00
mattwr18
4c7d371d29
Merge pull request #1385 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.5.3 
Bump graphql from 14.5.0 to 14.5.3 in /backend
 2019-08-27 15:21:03 +02:00
dependabot-preview[bot]
c9924fed2b
Bump graphql from 14.5.0 to 14.5.3 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.0 to 14.5.3.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.0...v14.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 07:10:05 +00:00
mattwr18
f509cea423
Merge pull request #1403 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.6 
Bump graphql-shield from 6.0.5 to 6.0.6 in /backend
 2019-08-27 09:10:01 +02:00
dependabot-preview[bot]
42049ffaf0
Bump eslint from 6.2.1 to 6.2.2 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.2.1...v6.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 07:09:36 +00:00
mattwr18
e673ea73b8
Merge pull request #1389 from Human-Connection/dependabot/npm_and_yarn/backend/babel-eslint-10.0.3 
Bump babel-eslint from 10.0.2 to 10.0.3 in /backend
 2019-08-27 09:08:06 +02:00
mattwr18
2699cdd920
Merge pull request #1384 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.0 
Bump apollo-server from 2.8.2 to 2.9.0 in /backend
 2019-08-27 09:06:16 +02:00
mattwr18
8ec6b3a92f
Merge pull request #1382 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.1 
Bump date-fns from 2.0.0 to 2.0.1 in /backend
 2019-08-27 09:05:37 +02:00
dependabot-preview[bot]
91aa518c58
Bump graphql-shield from 6.0.5 to 6.0.6 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 6.0.5 to 6.0.6.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v6.0.5...v6.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 04:22:02 +00:00
Wolfgang Huß
af968461b6 Split handleNotificationsMiddleware in notificationsMiddleware and hashtagsMiddleware 2019-08-26 16:24:43 +02:00
Wolfgang Huß
7498d88a44 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-26 15:44:32 +02:00
dependabot-preview[bot]
90a9f672e9
Bump apollo-server from 2.8.2 to 2.9.0 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.8.2 to 2.9.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.8.2...apollo-server@2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 11:46:58 +00:00
dependabot-preview[bot]
37ec1a5a4f
Bump babel-eslint from 10.0.2 to 10.0.3 in /backend 
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 11:45:41 +00:00
mattwr18
f11091c4ce
Merge pull request #1387 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.0 
Bump apollo-server-testing from 2.8.2 to 2.9.0 in /backend
 2019-08-26 13:44:50 +02:00
dependabot-preview[bot]
c3c07333a6
Bump date-fns from 2.0.0 to 2.0.1 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0 to 2.0.1.
- [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...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 11:38:38 +00:00
dependabot-preview[bot]
c8f7391d05
Bump apollo-server-testing from 2.8.2 to 2.9.0 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.8.2 to 2.9.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.8.2...apollo-server-testing@2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:27:11 +00:00
dependabot-preview[bot]
7c78a5f889
Bump apollo-server-express from 2.8.2 to 2.9.0 in /backend 
Bumps [apollo-server-express](https://github.com/apollographql/apollo-server) from 2.8.2 to 2.9.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-express@2.8.2...apollo-server-express@2.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 04:24:27 +00:00
Wolfgang Huß
2600c69185 Change code after @mattwr18 suggestions 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-23 15:57:31 +02:00
Wolfgang Huß
df4f0627b5 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/index.js
 2019-08-23 15:31:48 +02:00
roschaefer
123c30b301 Fix "cannot read property id of null" in staging 2019-08-23 14:53:52 +02:00
Robert Schäfer
b82743463e
Merge pull request #1368 from Human-Connection/1352-fix-update-post-resolver 
Fix UpdatePost resolver/validations
 2019-08-23 13:37:16 +02:00
Matt Rider
79e6b56396 Use ES6 syntax to avoid repetition 2019-08-23 12:35:53 +02:00
Matt Rider
8555148e53 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1352-fix-update-post-resolver 2019-08-23 12:19:19 +02:00
Matt Rider
cd5e492569 Await relation be added 2019-08-23 12:18:53 +02:00
Robert Schäfer
f4f98a95c9
Merge pull request #1356 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-standard-14.0.1 
Bump eslint-config-standard from 14.0.0 to 14.0.1 in /backend
 2019-08-23 11:46:57 +02:00
ogerly
53532025d6 Fix translation add backend test case todo 2019-08-23 11:36:41 +02:00
Matt Rider
abbfc6d757 Remove commented out, unneeded code 2019-08-23 11:30:20 +02:00
ogerly
0bb71cfbb3 Specs tests run through cleanly 2019-08-23 11:02:24 +02:00
ogerly
592a682bd7 Temporary commit 2019-08-23 11:02:24 +02:00
ogerly
2b634b8706 BUGFIX: 'email' attribute is the ID 2019-08-23 11:02:24 +02:00
ogerly
36ce6361ec Alle Daten übernommen die für serverseitig rendern nötig sind 2019-08-23 11:02:24 +02:00
Matt Rider
773779e5f1 Fix UpdatePost resolver/validations 2019-08-23 10:57:11 +02:00
mattwr18
28e2364af9
Merge pull request #1348 from Human-Connection/update_transitive_dependencies 
Update transitive dependencies
 2019-08-23 08:30:56 +02:00
dependabot-preview[bot]
417339b7cc
Bump eslint-config-standard from 14.0.0 to 14.0.1 in /backend 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 14.0.0 to 14.0.1.
- [Release notes](https://github.com/standard/eslint-config-standard/releases)
- [Changelog](https://github.com/standard/eslint-config-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/standard/eslint-config-standard/compare/v14.0.0...v14.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 04:34:42 +00:00
roschaefer
400b648ae9 Update transitive dependencies 
I see a security vulnerability warning on Github. I hope that updating
transitive dependencies will silence the security warning.

I did `rm yarn.lock` followed by `yarn install`.

EDIT: OK, I found out what's causing the security warning. With
```
yarn list lodash
├─ bitcore-lib@0.13.19
│  └─ lodash@3.10.1
└─ lodash@4.17.15
```
gives us the hint that the outdated lodash comes from `bitcore-lib`
which in turn is required by the extremely outdated `activitystrea.ms`
package. I tried to update it's dependencies in my fork without success.
If we ever touch the activity pub implementation we might have to
maintain this package ourselves.

FYI: @Mastercuber
 2019-08-23 01:55:31 +02:00
roschaefer
62c8d34079 Fix expiration dates of JWT and cookie 
This won't fix the bug that can happen in `nuxtServerInit`. However,
according to the docs, we accepted JWT which was valid for 1000 days and
our cookie was valid for 3 days - completely weird.

See:
https://github.com/auth0/node-jsonwebtoken
https://github.com/nuxt-community/apollo-module
 2019-08-22 22:29:50 +02:00