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

1127 Commits

Author SHA1 Message Date
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
Alexander Friedland
41767cc27e
Merge branch 'master' into C-1187-terms-and-conditions-confirmed-function 2019-09-03 09:51:12 +02:00
ogerly
1b9303ceaf Jest tests for the Terms and Conditions in frontend and backend 2019-09-03 09:46:18 +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]
9c23e2d371
Bump metascraper-youtube from 5.6.6 to 5.6.7 in /backend 
Bumps [metascraper-youtube](https://github.com/microlinkhq/metascraper-youtube) from 5.6.6 to 5.6.7.
- [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-09-02 04:23:45 +00:00
dependabot-preview[bot]
a2495bb96e
Bump metascraper-soundcloud from 5.6.6 to 5.6.7 in /backend 
Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper-soundcloud) from 5.6.6 to 5.6.7.
- [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-09-02 04:23:13 +00: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
Robert Schäfer
0641320ac1
Merge pull request #1430 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-node-9.2.0 
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /backend
 2019-08-30 22:11:54 +02:00
roschaefer
98194ef54a Follow @mattwr18's suggestions 2019-08-30 16:00:32 +02:00
Matt Rider
fd9a355910 Fix incorrect id in seeds notification 
- Jenny Rostok was being notified that someone had mentioned them in p2, when actually it was Peter Lustig who had been mentioned.
 2019-08-30 16:00:32 +02:00
roschaefer
cbcba8f08d Follow @Tirokk's suggestion 2019-08-30 16:00:32 +02:00
roschaefer
c29ee5e3d3 Update notifications in place 2019-08-30 16:00:32 +02:00
roschaefer
994ab43950 Change the behaviour how notifications get created 
I think it makes more sense to update an existing notification in place.
Ie. if there was already a notification, just mark it as unread so it
ends up in the recipient's notification list again.
 2019-08-30 16:00:32 +02:00
roschaefer
bf6e7a8131 Implement fallback resolvers for Post and Comment 2019-08-30 16:00:32 +02:00
roschaefer
9b2c707aa3 DRY notifications resolver 2019-08-30 16:00:32 +02:00
roschaefer
733c2d5ce1 All backend tests pass 2019-08-30 16:00:32 +02:00
roschaefer
3f121c7c4d Refine notification behaviour: 
If you mark a post or comment as read even though you already marked the
corresponding notification as read, then you receive `null`.
 2019-08-30 16:00:32 +02:00
roschaefer
2846a6a8d3 Spec for notifications passing 2019-08-30 16:00:32 +02:00
roschaefer
cf8ead10f3 Start to refactor backend tests 2019-08-30 16:00:32 +02:00
roschaefer
4b96454b90 Notifications resolver capable of orderBy + filter 2019-08-30 16:00:32 +02:00
roschaefer
643d175ef6 Implement notifications resolver 2019-08-30 16:00:32 +02:00
dependabot-preview[bot]
d78349879d
Bump neo4j-driver from 1.7.5 to 1.7.6 in /backend 
Bumps [neo4j-driver](https://github.com/neo4j/neo4j-javascript-driver) from 1.7.5 to 1.7.6.
- [Release notes](https://github.com/neo4j/neo4j-javascript-driver/releases)
- [Commits](https://github.com/neo4j/neo4j-javascript-driver/compare/1.7.5...1.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 13:49:20 +00:00
dependabot-preview[bot]
cbfaf292d7
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /backend 
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.1.0 to 9.2.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.1.0...v9.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 13:48:50 +00:00
Robert Schäfer
f207d66fbe
Merge pull request #1428 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.5.4 
Bump graphql from 14.5.3 to 14.5.4 in /backend
 2019-08-30 15:47:40 +02:00
Robert Schäfer
0a5052ba96
Merge pull request #1397 from Human-Connection/performance-improvement 
Check there are ids in the badIds array
 2019-08-30 14:08:13 +02:00
mattwr18
f275799856
Merge pull request #1351 from Human-Connection/1333-fix_checks_for_deleted_and_disabled 
Fix database import, pagination and counters on user profile page
 2019-08-30 13:51:41 +02:00
dependabot-preview[bot]
5332041e50
Bump graphql from 14.5.3 to 14.5.4 in /backend 
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.5.3 to 14.5.4.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.5.3...v14.5.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 11:39:02 +00:00
Matt Rider
cf60397477 Fix failing cypress test, add steps 
- Added step to expose the search feature was completely broken after my latest commit.
- when a user blocks another user, the search functionality just stopped working.
- reverted changes to @roschaefer hacky fix of the search functionality
 2019-08-30 07:47:57 +02:00
Matt Rider
42018f0bf4 Merge branch 'master' of github.com:Human-Connection/Human-Connection into performance-improvement 2019-08-30 07:17:19 +02:00
ogerly
f28ff69f3a Adaptation of Cypress tests, first attempt 2019-08-30 06:54:25 +02:00
dependabot-preview[bot]
3a2df2e8fc
Bump eslint-plugin-jest from 22.15.2 to 22.16.0 in /backend 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.15.2 to 22.16.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.15.2...v22.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 04:21:20 +00:00
Wolfgang Huß
c9c6605b3e 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-08-29 19:10:25 +02:00
Wolfgang Huß
dfcce21061 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-08-29 19:06:53 +02:00
Wolfgang Huß
327105da7a Refactor the extraction of hashtag out of a posts content 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-29 19:02:44 +02:00
Wolfgang Huß
0bc4c558ae Refactore the import and hashtags to all unicode characters 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-29 17:02:02 +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