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

1100 Commits

Author SHA1 Message Date
mattwr18
6b9bb4dfbb Merge branch '1395-hashtags-imported-with-not-allowed-chars' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 16:19:01 +02:00
Wolfgang Huß
5d69a6fa76 Implemented "wait-on": "~3.3.0" again 
Don't know why this was removed!?
 2019-09-04 15:56:28 +02:00
mattwr18
538b2b77de Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 14:21:12 +02:00
Robert Schäfer
acd1c9604b
Merge pull request #1459 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.2 
Bump nodemon from 1.19.1 to 1.19.2 in /backend
 2019-09-04 14:11:25 +02:00
Wolfgang Huß
0a86cb6c4d Merge branch '1395-hashtags-imported-with-not-allowed-chars' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 14:01:28 +02:00
Wolfgang Huß
bf511940ad Merge branch '1395-hashtags-imported-with-not-allowed-chars' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 13:59:04 +02:00
Wolfgang Huß
0037fc90de Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 13:52:47 +02:00
Wolfgang Huß
fd457e3c3c Refactor backend test to test some unicode letters are excepted 2019-09-04 13:51:23 +02:00
dependabot-preview[bot]
a175bb0f71
Bump nodemon from 1.19.1 to 1.19.2 in /backend 
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.1...v1.19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:54:17 +00:00
dependabot-preview[bot]
628f66f290
Bump eslint-config-prettier from 6.1.0 to 6.2.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-04 09:53:37 +00:00
roschaefer
ebf14cbe5c Encode the bearer token instead of hard-coding it 
That should fix our build server.
 2019-09-04 11:19:18 +02:00
mattwr18
25bd96eedf Remove package-lock.json 
- we are using yarn as a package manager
 2019-09-04 10:58:33 +02:00
mattwr18
b3964a1439 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-04 10:46:44 +02:00
mattwr18
fdee7efa03 Fix lint 2019-09-04 08:12:11 +02:00
Robert Schäfer
a4dc497585
Merge pull request #1448 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.3 
Bump apollo-server-testing from 2.9.1 to 2.9.3 in /backend
 2019-09-04 01:24:31 +02:00
dependabot-preview[bot]
125a1c8f63
Bump cross-env from 5.2.0 to 5.2.1 in /backend 
Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v5.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-03 22:01:57 +00:00
roschaefer
af8475f28e Avoid unavailable posts in relatedContributions 2019-09-03 23:19:55 +02:00
roschaefer
2a544376a3 Delete post.image 
In contrast to the other errors, it's better to send `null` for an
image. That way, the browser won't even try to load that url.
 2019-09-03 23:19:55 +02:00
mattwr18
9bb0884f89 Follow @alina-beck's PR suggestions 
- save regex to descriptive variables
 2019-09-03 22:10:02 +02:00
roschaefer
64268a1f3c Add locations to seeds, fix shoutedByCurrentUser 2019-09-03 21:28:29 +02:00
roschaefer
00454c874c Remove read-only attributes from posts mutations 
For the comments, the fix is not that easy: They are still using
`neo4j-graphql-js` in the resolvers. And that library needs the input
params for the query builder.

See: https://github.com/Human-Connection/Human-Connection/issues/1454
 2019-09-03 21:28:29 +02:00
roschaefer
3eea20f7c4 Follow @alinabeck's suggestions 2019-09-03 21:28:29 +02:00
roschaefer
672f19e6d1 More of @mattwr18's suggestions 2019-09-03 21:28:29 +02:00
roschaefer
bb3f419532 Refactor graphql queries and fix bug 
It's sometimes unbelievable how many bugs you find when doing
refactoring. This time there was some apparent confusion about
`commentsCount` and `commentedCount`. The counters on the post card were
never showing the correct number.
 2019-09-03 21:28:29 +02:00
roschaefer
7b44a87e3b Follow @mattwr18's suggestions 2019-09-03 21:28:29 +02:00
roschaefer
0b3bbb1f14 Delete post.title and obfuscate slug 2019-09-03 21:28:29 +02:00
roschaefer
bd885b1aac Delete emails and social media, bugfix 
The bugfix was missing '(' plus a wrong order for the social media
relationship called 'OWNED_BY'.
 2019-09-03 21:28:29 +02:00
roschaefer
2b83745f6b You cannot login if your account is deleted 2019-09-03 21:28:29 +02:00
roschaefer
491a626031 Replace deleteComment with a more KISS solution 2019-09-03 21:28:29 +02:00
roschaefer
c4ba2c4aeb SoftDeleteMiddleware obfuscates deleted resources 2019-09-03 21:28:29 +02:00
roschaefer
580c048cfa Remove obsolete report factory 2019-09-03 21:28:29 +02:00
roschaefer
e5be418076 Refactor seeds - no need for a factories server! 
Fix #1427
 2019-09-03 21:28:29 +02:00
roschaefer
afe47e84c0 Remove the organizations for now 
We haven't implemented them at all, so I would prefer not to have
obscure data in the database.
 2019-09-03 21:28:29 +02:00
roschaefer
784e1fd911 Fix one more cypress test, implement a factory 2019-09-03 21:28:29 +02:00
roschaefer
4d5769fbc6 Fix cypress tests and factories 2019-09-03 21:28:29 +02:00
roschaefer
76acebbb73 Notifications query filters for deleted resources 
This should finally fix #1414
 2019-09-03 21:28:29 +02:00
roschaefer
660e3434aa Implement delete of comments when post is deleted 2019-09-03 21:28:29 +02:00
roschaefer
1b5d91bfd2 Refactor post spec, implement soft delete, fix bug 
I think the validation for categories was too complex and the graphql
query 'PostEmotionsByCurrentUser' was erroneously allowed for
unauthenticated users.
 2019-09-03 21:28:29 +02:00
roschaefer
2033b1791c Fix posts resolver spec 2019-09-03 21:28:29 +02:00
roschaefer
3f5ac61b73 Fix users and report resolver specs 
This time I did not refactor the whole tests suites because of time and
complexity of the PR review.
 2019-09-03 21:28:29 +02:00
roschaefer
36ba4cc208 Refactor filterBubble spec 2019-09-03 21:28:29 +02:00
roschaefer
2d67c5f172 Refactored entire softDeleteMiddleware spec 2019-09-03 21:28:29 +02:00
roschaefer
0f64bbb71f Soft delete for comments implemented 2019-09-03 21:28:29 +02:00
roschaefer
4bfc0ff2bf Refactor comments.spec, refactor post factory 2019-09-03 21:28:29 +02:00
Matt Rider
d1309d2b8f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-09-02 12:51:11 +02:00
dependabot-preview[bot]
79455169fa
Bump apollo-server-testing from 2.9.1 to 2.9.3 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.9.1 to 2.9.3.
- [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.1...apollo-server-testing@2.9.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 06:10:29 +00:00
mattwr18
3e5a624147
Merge pull request #1445 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.9.3 
Bump apollo-server from 2.9.1 to 2.9.3 in /backend
 2019-09-02 08:08:15 +02:00
dependabot-preview[bot]
d64ee198bd
Bump apollo-server from 2.9.1 to 2.9.3 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.1 to 2.9.3.
- [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.1...apollo-server@2.9.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 04:22:58 +00:00
dependabot-preview[bot]
4367a06315
Bump eslint from 6.2.2 to 6.3.0 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.2.2 to 6.3.0.
- [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.2...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-02 04:22:15 +00:00
Robert Schäfer
a784bca62f
Merge pull request #1433 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-driver-1.7.6 
Bump neo4j-driver from 1.7.5 to 1.7.6 in /backend
 2019-08-30 22:12:07 +02:00