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

1060 Commits

Author SHA1 Message Date
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
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
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
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
roschaefer
e4d57f80aa Fix #1333 
Ok, so here are multiple issues:
1. In cypher, `NOT NULL` will return `NULL` not `FALSE`. If we want
`FALSE` to be set in the database import, we should use `COAELESCE`
to find the first not-null value.
See:
https://neo4j.com/docs/cypher-manual/current/syntax/working-with-null/
https://markhneedham.com/blog/2017/02/22/neo4j-null-values-even-work/

2. I removed the `disabled` and `deleted` checks on the commented
counter. With `neo4j-graphql-js` it is not possible to filter on the
join models (at least not without a lot of complexity) for disabled or
deleted items. Let's live with the fact that the list of commented posts
will include those posts, where the user has deleted his comment or where
the user's comment was disabled. It's being displayed as "not available"
so I think this is OK for now.

3. De-couple the pagination counters from the "commented", "shouted"
etc. counters. It might be that the list of posts is different for
different users. E.g. if the user has blocked you, the "posts" list
will be empty. The "shouted" or "commented" list will not have the
posts of the author. If you are a moderator, the list will include
disabled posts. So the counters are not in sync with the actual list
coming from the backend. Therefore I implemented "fetch and check if
resultSet < pageSize" instead of a global counter.
 2019-08-28 12:57:32 +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