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

5888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ogerly
4a4f1b4475 Tests of Cypress changes 2019-08-28 09:25: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
mattwr18
8c681408a6
Merge pull request #1409 from Human-Connection/dependabot/npm_and_yarn/mixin-deep-1.3.2 
[Security] Bump mixin-deep from 1.3.1 to 1.3.2
 2019-08-27 23:55:34 +02:00
mattwr18
c3184cf0ca
Merge pull request #1408 from Human-Connection/dependabot/npm_and_yarn/webapp/mixin-deep-1.3.2 
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /webapp
 2019-08-27 23:55:09 +02:00
dependabot-preview[bot]
094cbfa1ba
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 18:17:28 +00:00
dependabot-preview[bot]
acd9dbf6b5
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /webapp 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 18:17:05 +00:00
Matt Rider
907233cbc9 Increase nginx client max body size, split size legacy migration 
- allows the client to send files at least the size we agreed in the vue-dropzone
- we don't need such a small split size as we don't run it on the remote server
 2019-08-27 18:03:50 +02:00
Alina Beck
6e5ee7ea87
Merge branch 'master' into fix-editor-bugs 2019-08-27 16:45:36 +01:00
Alina Beck
604789b32e check for empty values 2019-08-27 16:37:28 +01:00
Alina Beck
10e11a4e9b style suggestion lists 2019-08-27 16:14:52 +01:00
Matt Rider
6892df5c7f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-08-27 16:45:35 +02:00
Alina Beck
d28864ab73 just focus on input if there is one 2019-08-27 15:41:04 +01:00
Robert Schäfer
0bf0ca0b8d
Merge pull request #1398 from Human-Connection/fix-deprecation-warnings 
Update to use <client-only> instead of <no-ssr>
 2019-08-27 16:00:09 +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
mattwr18
fbf2f05e00
Merge pull request #1381 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.1 
Bump date-fns from 2.0.0 to 2.0.1 in /webapp
 2019-08-27 15:20:39 +02:00
Alina Beck
a1c402ce8d style editor input field 2019-08-27 13:36:00 +01:00
mattwr18
3cf028080f
Merge pull request #1392 from Human-Connection/tune-neo4j-memory-specs 
Add memory limits to neo4j deployment
 2019-08-27 10:22:47 +02:00
Matt Rider
c07989d9bd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1395-hashtags-imported-with-not-allowed-chars 2019-08-27 10:20:33 +02:00
Matt Rider
470da18381 Revert to using async/await, follow @appinteractive PR suggestions 2019-08-27 09:55:05 +02:00
Matt Rider
ed76482daa Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1391-fix-bug-where-apollo-cache-not-updated-on-comment-deletion 2019-08-27 09:25:09 +02:00
Matt Rider
6976336ef0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into fix-deprecation-warnings 2019-08-27 09:20:27 +02:00
Matt Rider
c8b5779f87 Upgrade nuxt 
- for some reason there were two versions of vue-client-only in the yarn.lock, one old version which was blocking it from passing the build, and a newer one based on the use of <client-only>, upgrading nuxt sorted out the yarn.lock
 2019-08-27 09:16:41 +02:00
mattwr18
fa7d76b316
Merge pull request #1404 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc12 
Bump @nuxtjs/apollo from 4.0.0-rc11 to 4.0.0-rc12 in /webapp
 2019-08-27 09:10:37 +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
5a32f2d3ac
Merge pull request #1402 from Human-Connection/dependabot/npm_and_yarn/cypress-cucumber-preprocessor-1.15.0 
Bump cypress-cucumber-preprocessor from 1.14.1 to 1.15.0
 2019-08-27 09:09:29 +02: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
dependabot-preview[bot]
8b3dc2052a
Bump date-fns from 2.0.0 to 2.0.1 in /webapp 
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-27 07:07:59 +00:00
mattwr18
3b08dbe939
Merge pull request #1386 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-loader-3.0.0 
Bump eslint-loader from 2.2.1 to 3.0.0 in /webapp
 2019-08-27 09:07:25 +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
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
mattwr18
27871d16f6
Merge pull request #1401 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-utils-1.4.2 
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 in /webapp
 2019-08-27 08:34:29 +02:00
dependabot-preview[bot]
f852da7273
Bump @nuxtjs/apollo from 4.0.0-rc11 to 4.0.0-rc12 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc11 to 4.0.0-rc12.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.11...v4.0.0-rc.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 04:22:50 +00: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
dependabot-preview[bot]
eab79bd6ca
Bump cypress-cucumber-preprocessor from 1.14.1 to 1.15.0 
Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.14.1 to 1.15.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.14.1...v1.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-27 04:21:39 +00:00
Matt Rider
20c625a827 Update broken cypher statement 
- I think this does what you want @Tirokk, but let me know if I missed something
- this removes all white spaces in the hashtag, then removes any hashtags that have special characters, or that start with a number, but do not have any letters after
- it does not check that the size is greater or equal to 1 because the regex already removes anything that does not have at least one character
 2019-08-27 01:35:28 +02:00
mattwr18
4023849600
Merge pull request #1376 from Human-Connection/fix-infinite-loading 
Fix infinite-loading infinitely loading
 2019-08-26 21:44:19 +02: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
dependabot-preview[bot]
ab79f3c633
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 in /webapp 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. **This update includes a security fix.**
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-26 18:21:42 +00:00
Matt Rider
ba1e62da21 Update the apollo cache 2019-08-26 18:54:21 +02:00
Wolfgang Huß
25bac9a84c Correct the import of tags from the Alpha 
Remove the tags which can not be corrected.

Co-Authored-By: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2019-08-26 18:24:21 +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
Alina Beck
f47502ade1 survive empty urls 2019-08-26 16:38:33 +01:00
Matt Rider
2af4151918 Update to use <client-only> instead of <no-ssr> 2019-08-26 17:09:24 +02:00
Alina Beck
1df3cb1ed1 get link input to work 2019-08-26 16:08:46 +01:00
roschaefer
8b31cefebe If this commit fixes the build, docs are broken 
The latest commit has some cypress tests failing when only a few posts
are visible on the index page. If this explicit default fixes the tests,
the documentation cannot be quite right in saying that it's the default.

FYI: @mattwr18
 2019-08-26 16:58:11 +02:00