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

5457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
bc6f8849c0
Merge pull request #1288 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.2.0 
Bump eslint from 6.1.0 to 6.2.0 in /backend
 2019-08-19 20:04:04 +02:00
Matt Rider
555c5254bc Add tests, validations for too many categories 
- Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-08-19 17:31:55 +02:00
Alina Beck
3703fc787a fix lint errors – thanks github editor 2019-08-19 16:23:38 +01:00
Wolfgang Huß
aae5fd396e Merge branch '1017-send-out-notifications-on-create-omment' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotifications.js
#	backend/src/middleware/handleNotifications/handleNotifications.spec.js
#	webapp/components/notifications/Notification/Notification.vue
#	webapp/components/notifications/NotificationMenu/NotificationMenu.vue
 2019-08-19 16:58:18 +02:00
dependabot-preview[bot]
e8483e28d0
Bump dotenv from 8.0.0 to 8.1.0 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.0.0...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 14:56:51 +00:00
Matt Rider
3b09c31cbb Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-19 16:55:29 +02:00
Robert Schäfer
13d9965599
Merge pull request #1294 from Human-Connection/1221-fix-logout-login-bug 
Downgrade @nuxtjs/apollo
 2019-08-19 16:54:51 +02:00
Robert Schäfer
8e28bf35dc
Merge pull request #1289 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.7.1 
Bump neo4j-graphql-js from 2.7.0 to 2.7.1 in /backend
 2019-08-19 16:54:18 +02:00
Robert Schäfer
baaf572405
Merge pull request #1286 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0-beta.5 
Bump date-fns from 2.0.0-beta.4 to 2.0.0-beta.5 in /backend
 2019-08-19 16:51:14 +02:00
dependabot-preview[bot]
f65c3dea14
Bump jest from 24.8.0 to 24.9.0 in /webapp 
Bumps [jest](https://github.com/facebook/jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.8.0...v24.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 14:50:55 +00:00
dependabot-preview[bot]
ab01ba5d08
Bump eslint from 6.1.0 to 6.2.0 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.1.0 to 6.2.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.1.0...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 14:50:29 +00:00
dependabot-preview[bot]
4900ecdb62
Bump babel-jest from 24.8.0 to 24.9.0 in /backend 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.9.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 14:50:22 +00:00
Robert Schäfer
3b6e211640
Merge pull request #1290 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0-beta.5 
Bump date-fns from 2.0.0-beta.4 to 2.0.0-beta.5 in /webapp
 2019-08-19 16:50:20 +02:00
Robert Schäfer
362c299888
Merge pull request #1291 from Human-Connection/dependabot/npm_and_yarn/backend/dotenv-8.1.0 
Bump dotenv from 8.0.0 to 8.1.0 in /backend
 2019-08-19 16:48:54 +02:00
Robert Schäfer
8a147c5153
Merge pull request #1292 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-jest-24.9.0 
Bump babel-jest from 24.8.0 to 24.9.0 in /webapp
 2019-08-19 16:48:32 +02:00
Robert Schäfer
99eb2d7da1
Merge pull request #1293 from Human-Connection/dependabot/npm_and_yarn/backend/jest-24.9.0 
Bump jest from 24.8.0 to 24.9.0 in /backend
 2019-08-19 16:48:12 +02:00
Alina Beck
b74c47a265
Merge branch 'master' into add-masonry-grid 2019-08-19 15:05:54 +01:00
Alina Beck
0bb746804b add masonry grid item tests 2019-08-19 14:06:32 +01:00
Alina Beck
5abf6003cc add tests for masonry grid 2019-08-19 13:15:13 +01:00
Alina Beck
52c3a15be1 use masonry grid on user profile 2019-08-19 12:01:43 +01:00
Matt Rider
053d8bcf7b Fix UserQuery 2019-08-19 11:41:23 +02:00
Alina Beck
bec5ed9695 remove computed props from grid 2019-08-19 10:37:20 +01:00
Alina Beck
b0de4ec2b5 move calculation from grid to grid item 2019-08-19 10:16:44 +01:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
mattwr18
90fa70e83d
Merge pull request #1282 from Human-Connection/count_from_0_to_0_by_default 
Get rid of property warnings
 2019-08-19 10:06:09 +02:00
Robert Schäfer
87461c21ca
Merge pull request #1280 from Human-Connection/refactor-graphql-queries 
Refactor graphql queries
 2019-08-19 09:58:38 +02:00
Matt Rider
12131f2ee3 Downgrade @nuxtjs/apollo 
- Upgrading breaks our logut/login flow
- see
https://github.com/nuxt-community/apollo-module/releases
https://github.com/nuxt-community/apollo-module/pull/242/files
 2019-08-19 09:03:37 +02:00
Wolfgang Huß
68c25b8d54 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotifications.spec.js
 2019-08-19 08:42:00 +02:00
dependabot-preview[bot]
2d2563e264
Bump jest from 24.8.0 to 24.9.0 in /backend 
Bumps [jest](https://github.com/facebook/jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.8.0...v24.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:36:44 +00:00
dependabot-preview[bot]
63c05d76b5
Bump babel-jest from 24.8.0 to 24.9.0 in /webapp 
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.9.0/packages/babel-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:36:03 +00:00
dependabot-preview[bot]
96007bb42e
Bump dotenv from 8.0.0 to 8.1.0 in /backend 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v8.0.0...v8.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:35:23 +00:00
dependabot-preview[bot]
a2e1f52294
Bump date-fns from 2.0.0-beta.4 to 2.0.0-beta.5 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.4 to 2.0.0-beta.5.
- [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-beta.4...v2.0.0-beta.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:34:24 +00:00
dependabot-preview[bot]
7669f22831
Bump neo4j-graphql-js from 2.7.0 to 2.7.1 in /backend 
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.7.0 to 2.7.1.
- [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-19 04:33:44 +00:00
dependabot-preview[bot]
47b0e259d4
Bump date-fns from 2.0.0-beta.4 to 2.0.0-beta.5 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.4 to 2.0.0-beta.5.
- [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-beta.4...v2.0.0-beta.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-19 04:31:24 +00:00
Alina Beck
0aa1b8046b remove grid logic from post component 2019-08-18 18:28:48 +01:00
Alina Beck
76be960c03 move grid calculations to masonry grid components 2019-08-18 18:25:14 +01:00
Wolfgang Huß
a972215579 Lint fix 2019-08-16 18:29:26 +02:00
Wolfgang Huß
f653bac9e1 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.spec.js
 2019-08-16 18:22:36 +02:00
Wolfgang Huß
1ff7750918 Remove comment 2019-08-16 18:15:40 +02:00
Wolfgang Huß
0b9a58e317 Wrote and tested the mention of a blocked user on a post of a blocker 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-16 18:14:14 +02:00
roschaefer
aa52587f83 Get rid of property warnings 
If we always choose `0` as the default value for `endVal` in case it is
not given (maybe apollo assigns null when the request is in flight) then
just make `0` the default.
 2019-08-16 17:08:00 +02:00
Wolfgang Huß
efb5c75c24 Refactor after Roberts suggestions, number I 
Start writing tests
 2019-08-16 16:56:14 +02:00
roschaefer
b27a01438e Damn you're right @mattwr18 
You are right with this statement: https://github.com/Human-Connection/Human-Connection/pull/1280#discussion_r314675882
 2019-08-16 16:53:38 +02:00
mattwr18
90e5579cab
Merge pull request #1278 from Human-Connection/fix_hashtag_db_import 
Fix hashtag db import
 2019-08-16 14:37:09 +02:00
mattwr18
d0dab6fdf8
Merge pull request #1277 from Human-Connection/fix_bug_on_admin_dashboard 
Fix `Cannot read property countUser of null`
 2019-08-16 14:34:11 +02:00
Matt Rider
fdc0d808f6 Fix search query 2019-08-16 14:18:18 +02:00
Matt Rider
dbaa8e687f Fix vue warnings, fix tests, refactor 
- was throwing an error when trying to update commentsCount because of new implementation by @roschaefer which uses countResolver, but there was no related for commentsCount, it was r... also commentsCount is no longer needed anywhere in the code base, it is commentedCount now
 2019-08-16 13:28:55 +02:00
Matt Rider
d511d6aa78 Refactor graphql queries 
- Remove duplicate queries
- Use smart query in pages/post/_id/_slug/index.vue to avoid multiple db requests for a post and its comments.
We cannot update the apollo cache with asyncData and smart queries have a prefetch policy set to true by default, which
means that they will resolve in a similar timeframe. https://stackoverflow.com/questions/55885337/in-nuxt-should-i-use-asyncdata-or-default-apollo-queries
https://vue-apollo.netlify.com/api/smart-query.html#options
https://vue-apollo.netlify.com/guide/ssr.html#vue-cli-plugin
 2019-08-16 11:25:53 +02:00
Robert Schäfer
cd80981130
Merge pull request #1279 from Human-Connection/dependabot/npm_and_yarn/backend/hapi/joi-15.1.1 
Bump @hapi/joi from 15.1.0 to 15.1.1 in /backend
 2019-08-16 10:27:06 +02:00
mattwr18
50fc7b8580
Merge pull request #1271 from Human-Connection/fix_missing_slug 
Fix user mention menu on production data
 2019-08-16 09:22:46 +02:00