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

1383 Commits

Author SHA1 Message Date
mattwr18
290bdf5ff4
Merge pull request #1440 from Human-Connection/1414-soft_delete 
1414 Implement soft delete
 2019-09-03 23:59:52 +02:00
roschaefer
5f14b4c45f Fix lint 2019-09-03 23:19:55 +02:00
roschaefer
99dd6ea20a Centralize fragments, fix @mattwr18's bugs 
Most of those bugs weren't even introduced in this PR, e.g. the missing
`this.$i18n` for the comments mutations.
 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
933e092549 Fix frontend tests 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
Robert Schäfer
649c51c705
Merge pull request #1452 from Human-Connection/separate-text-at-words 
Use hyphens to separate words properly
 2019-09-03 18:12:02 +02:00
Alina Beck
f34ff188eb disable scrolling behind popover 2019-09-03 11:44:22 +01:00
Alina Beck
0fd0cdbe34 separate post title and content with hyphens 2019-09-02 16:46:41 +01:00
Matt Rider
accb8ae505 Follow @alina-beck's suggestions 
- set items to the full list of hashtags or users to avoid unnecessarily reassigning the items variable based on suggestionType
- refactor tests to trigger onFilter, which calls filterSuggestionList, then check that it returns a maximum of 15 items both for queries and empty queries
- fix description with incorrect type(users, instead of hashtags)
- return 15 items, not 14
 2019-09-02 15:43:18 +02:00
Matt Rider
cf10b650ae Limit suggestions list to 15, add component tests 2019-09-02 10:42:37 +02:00
roschaefer
98194ef54a Follow @mattwr18's suggestions 2019-08-30 16:00:32 +02:00
roschaefer
30a95e5713 Fix lint 2019-08-30 16:00:32 +02:00
roschaefer
cbcba8f08d Follow @Tirokk's suggestion 2019-08-30 16:00:32 +02:00
roschaefer
66b12090a7 Fix cypress tests 2019-08-30 16:00:32 +02:00
roschaefer
f635b0cbd5 Fix frontend tests 2019-08-30 16:00:32 +02:00
roschaefer
c585b23d7a Fix notification queries in webapp 2019-08-30 16:00:32 +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
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
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]
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
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
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
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
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
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
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
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
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
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