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
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
Matt Rider
6de602fd58 Revert @roschaefer's hacky fix to Search.feature 
- now that we are checking to see if there are any badIds, it was breaking the search functionality
 2019-08-26 21:37:36 +02:00
Matt Rider
b990a1055b Fix search functionality 
- remove unused line that allows for an empty array of author_not.id_in
 2019-08-26 17:51:44 +02:00
roschaefer
9f6757f409 Use guard clauses if possible 2019-08-26 16:53:22 +02:00
Wolfgang Huß
af968461b6 Split handleNotificationsMiddleware in notificationsMiddleware and hashtagsMiddleware 2019-08-26 16:24:43 +02:00
Matt Rider
75d984073d Check there are ids in the badIds array 
- if there are no ids, we shouldn't add an empty array since it adds unneccessarily to our auto-generated post query and affects greatly performance. see issue #1390
 2019-08-26 16:19:42 +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
Wolfgang Huß
8e893b2c5d Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-22 15:28:49 +02:00
Wolfgang Huß
793485c0fc Write frontend tests 2019-08-22 15:20:40 +02:00
Wolfgang Huß
04fe6b0a8c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotificationsMiddleware.spec.js

Refactored there tests a little
 2019-08-22 11:02:10 +02:00
mattwr18
628d5412fa
Merge pull request #1344 from Human-Connection/dependabot/docker/backend/node-12.9-alpine 
Bump node from 12.8-alpine to 12.9-alpine in /backend
 2019-08-22 10:30:36 +02:00
Wolfgang Huß
3e91a66673 Correct wrong merge of master 2019-08-22 08:32:19 +02:00
dependabot-preview[bot]
645fd62bb7
Bump node from 12.8-alpine to 12.9-alpine in /backend 
Bumps node from 12.8-alpine to 12.9-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-22 04:26:29 +00:00
dependabot-preview[bot]
b0eea623a1
Bump eslint-plugin-jest from 22.15.1 to 22.15.2 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.1 to 22.15.2.
- [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.15.1...v22.15.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-22 04:23:23 +00:00
Robert Schäfer
deb0fcabd4
Merge pull request #1268 from Human-Connection/post-needs-to-have-category#1222 
Validate that a post cannot be created without categories/too many categories
 2019-08-21 16:28:32 +02:00
Robert Schäfer
4673908e2f
Merge pull request #1320 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0 
Bump date-fns from 2.0.0-beta.5 to 2.0.0 in /backend
 2019-08-21 16:03:38 +02:00
Robert Schäfer
2cae56f391
Merge pull request #1328 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.8.2 
Bump apollo-server-testing from 2.8.1 to 2.8.2 in /backend
 2019-08-21 15:49:48 +02:00
Wolfgang Huß
9a799657e9 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.js
 2019-08-21 14:42:19 +02:00
Wolfgang Huß
3d2df56141 Backend tests 2019-08-21 14:27:32 +02:00
Robert Schäfer
bb7730d418
Merge pull request #1319 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.5 
Bump graphql-shield from 6.0.4 to 6.0.5 in /backend
 2019-08-21 13:45:25 +02:00
Robert Schäfer
d8634a68b4
Merge pull request #1326 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.6.2 
Bump @sentry/node from 5.6.1 to 5.6.2 in /backend
 2019-08-21 13:43:52 +02:00
dependabot-preview[bot]
c8287a0fd4
Bump date-fns from 2.0.0-beta.5 to 2.0.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.5 to 2.0.0.
- [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.5...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 11:36:11 +00:00
Robert Schäfer
f031cb3a18
Merge pull request #1322 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.8.2 
Bump apollo-server from 2.8.1 to 2.8.2 in /backend
 2019-08-21 13:34:15 +02:00