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

5219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7f2aefb3b7
Merge pull request #1429 from Human-Connection/dependabot/npm_and_yarn/neo4j-driver-1.7.6 
Bump neo4j-driver from 1.7.5 to 1.7.6
 2019-08-30 15:47:21 +02:00
Robert Schäfer
080288d0bc
Merge pull request #1431 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-node-9.2.0 
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /webapp
 2019-08-30 15:47:00 +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]
ba65848070
Bump eslint-plugin-node from 9.1.0 to 9.2.0 in /webapp 
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 11:40:29 +00: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
Robert Schäfer
565e8b4d93
Merge pull request #1432 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.16.0 
Bump eslint-plugin-jest from 22.15.2 to 22.16.0 in /backend
 2019-08-30 13:38:52 +02:00
Robert Schäfer
c620bec10f
Merge pull request #1434 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-8.0.0 
Bump sass-loader from 7.3.1 to 8.0.0 in /webapp
 2019-08-30 13:38:28 +02:00
Robert Schäfer
5dff0c0396
Merge pull request #1435 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.16.0 
Bump eslint-plugin-jest from 22.15.2 to 22.16.0 in /webapp
 2019-08-30 13:38:03 +02:00
Robert Schäfer
ea2c5904fa
Merge pull request #1436 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-izitoast-1.2.1 
Bump vue-izitoast from 1.2.0 to 1.2.1 in /webapp
 2019-08-30 13:37:47 +02:00
Robert Schäfer
bd101cc3af
Merge pull request #1437 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.5.4 
Bump graphql from 14.5.3 to 14.5.4 in /webapp
 2019-08-30 13:36:57 +02:00
Matt Rider
f6ba3cf581 Uncomment out feature steps 2019-08-30 08:00:07 +02: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
dependabot-preview[bot]
86d0157cee
Bump graphql from 14.5.3 to 14.5.4 in /webapp 
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 04:23:53 +00:00
dependabot-preview[bot]
25b7ccfee8
Bump vue-izitoast from 1.2.0 to 1.2.1 in /webapp 
Bumps [vue-izitoast](https://github.com/arthurvasconcelos/vue-izitoast) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/arthurvasconcelos/vue-izitoast/releases)
- [Changelog](https://github.com/arthurvasconcelos/vue-izitoast/blob/master/CHANGELOG.md)
- [Commits](https://github.com/arthurvasconcelos/vue-izitoast/compare/1.2.0...1.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 04:23:22 +00:00
dependabot-preview[bot]
9af97105ba
Bump eslint-plugin-jest from 22.15.2 to 22.16.0 in /webapp 
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:22:37 +00:00
dependabot-preview[bot]
f75096394d
Bump sass-loader from 7.3.1 to 8.0.0 in /webapp 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.3.1 to 8.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.3.1...v8.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-30 04:21:59 +00: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
dependabot-preview[bot]
ee831d9e0c
Bump neo4j-driver from 1.7.5 to 1.7.6 
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 04:20:01 +00:00
Robert Schäfer
3e0565d19d
Merge pull request #1417 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.16.0 
Bump cypress-cucumber-preprocessor from 1.15.1 to 1.16.0
 2019-08-29 14:28:39 +02:00
Robert Schäfer
fe9723b56d
Merge pull request #1423 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-dropzone-1.0.4 
Bump nuxt-dropzone from 1.0.3 to 1.0.4 in /webapp
 2019-08-29 12:41:39 +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
roschaefer
e10629a0fe Fix imports 2019-08-29 11:45:17 +02:00
roschaefer
396c9e959e Add some missing documentation for e2e testing 2019-08-29 11:30:32 +02:00
dependabot-preview[bot]
e45bb492a1 Bump cypress-cucumber-preprocessor from 1.15.1 to 1.16.0 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.15.1 to 1.16.0.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.15.1...v1.16.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 11:09:47 +02:00
dependabot-preview[bot]
cd2868a421
Bump nuxt-dropzone from 1.0.3 to 1.0.4 in /webapp 
Bumps [nuxt-dropzone](https://github.com/Etheryte/nuxt-dropzone) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/Etheryte/nuxt-dropzone/releases)
- [Commits](https://github.com/Etheryte/nuxt-dropzone/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 08:48:07 +00: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
a6e71267a9
Merge pull request #1421 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-2.9.2 
Bump nuxt from 2.9.1 to 2.9.2 in /webapp
 2019-08-29 10:45:36 +02: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
Robert Schäfer
21b0b4536c
Merge pull request #1418 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.9.1 
Bump apollo-server-testing from 2.9.0 to 2.9.1 in /backend
 2019-08-29 10:44:32 +02:00
dependabot-preview[bot]
caa6709ca8
Bump nuxt from 2.9.1 to 2.9.2 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.9.1 to 2.9.2.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.9.1...v2.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-29 04:24:55 +00: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
2070a49b64
Merge pull request #1406 from Human-Connection/fix-editor-bugs 
Fix Editor Bugs
 2019-08-28 23:55:31 +02:00
Alina Beck
9b405377f9 fix input height in all browsers 2019-08-28 20:16:17 +01: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
Robert Schäfer
079ced0593
Merge pull request #1400 from Human-Connection/1391-fix-bug-where-apollo-cache-not-updated-on-comment-deletion 
Update the apollo cache
 2019-08-28 19:37:59 +02:00
Robert Schäfer
b0b7bd088e
Merge pull request #1407 from Human-Connection/fix-nginx-file-size-warnings 
Increase nginx client max body size, split size legacy migration
 2019-08-28 19:17:04 +02:00
Robert Schäfer
a9c0d9c618
Merge pull request #1410 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.15.1 
Bump cypress-cucumber-preprocessor from 1.15.0 to 1.15.1
 2019-08-28 19:04:32 +02:00
Robert Schäfer
41654914c7
Merge pull request #1411 from Human-Connection/simplify_cypress_testing_on_docker 
Simplify cypress testing on docker
 2019-08-28 18:53:18 +02:00
roschaefer
d2ce92f2ec Update docs 2019-08-28 14:09:23 +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
roschaefer
bfa0509693 This should fix our endless debugging 
@ogerly all you have to do now is to `docker-compose up`. On your host
machine, you can run `yarn run cypress:open` to run the tests.
 2019-08-28 12:34:21 +02:00
dependabot-preview[bot]
cf3b736777
Bump cypress-cucumber-preprocessor from 1.15.0 to 1.15.1 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.15.0 to 1.15.1.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.15.0...v1.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-28 04:26:08 +00:00