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

936 Commits

Author SHA1 Message Date
Matt Rider
7bbbf40bcc Update seeds to create post with a category 2019-08-20 16:39:26 +02:00
Matt Rider
a000719663 Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 16:13:38 +02:00
Matt Rider
29f39c4f45 Update backend tests 
- Every test that created or updated a post needed to be updated to add categoryIds
 2019-08-20 15:54:51 +02:00
Robert Schäfer
a8baca47ae
Merge pull request #1302 from Human-Connection/dependabot/npm_and_yarn/backend/uuid-3.3.3 
Bump uuid from 3.3.2 to 3.3.3 in /backend
 2019-08-20 14:05:29 +02:00
mattwr18
830552cfc4
Merge pull request #1018 from Human-Connection/1017-send-out-notifications-on-create-omment 
🍰 Send out notifications on CreateComment
 2019-08-20 13:25:34 +02:00
dependabot-preview[bot]
728dde01e7
Bump uuid from 3.3.2 to 3.3.3 in /backend 
Bumps [uuid](https://github.com/kelektiv/node-uuid) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/kelektiv/node-uuid/releases)
- [Changelog](https://github.com/kelektiv/node-uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kelektiv/node-uuid/compare/v3.3.2...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 10:11:14 +00:00
Robert Schäfer
569cdb1f75
Merge pull request #1297 from Human-Connection/dependabot/npm_and_yarn/backend/neode-0.3.2 
Bump neode from 0.3.1 to 0.3.2 in /backend
 2019-08-20 12:08:46 +02:00
Robert Schäfer
00299b3e0b
Merge pull request #1304 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-prettier-6.1.0 
Bump eslint-config-prettier from 6.0.0 to 6.1.0 in /backend
 2019-08-20 12:07:24 +02:00
Matt Rider
e79347637c Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 09:52:11 +02:00
dependabot-preview[bot]
b4b7f05301
Bump neode from 0.3.1 to 0.3.2 in /backend 
Bumps [neode](https://github.com/adam-cowley/neode) from 0.3.1 to 0.3.2.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 07:42:06 +00:00
Matt Rider
dc1e25b090 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-20 08:38:00 +02:00
dependabot-preview[bot]
06b2a5b2a4
Bump eslint-config-prettier from 6.0.0 to 6.1.0 in /backend 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.0.0...v6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 04:25:52 +00:00
dependabot-preview[bot]
62e3245007
Bump eslint-plugin-standard from 4.0.0 to 4.0.1 in /backend 
Bumps [eslint-plugin-standard](https://github.com/standard/eslint-plugin-standard) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/standard/eslint-plugin-standard/releases)
- [Commits](https://github.com/standard/eslint-plugin-standard/compare/v4.0.0...v4.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 04:24:10 +00:00
Robert Schäfer
2e3cc0a039
Merge pull request #1284 from Human-Connection/dependabot/npm_and_yarn/backend/babel-jest-24.9.0 
Bump babel-jest from 24.8.0 to 24.9.0 in /backend
 2019-08-19 20:04:36 +02:00
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
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
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]
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
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
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
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
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
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]
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]
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
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
Wolfgang Huß
efb5c75c24 Refactor after Roberts suggestions, number I 
Start writing tests
 2019-08-16 16:56:14 +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
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
dependabot-preview[bot]
ba1052d337
Bump @hapi/joi from 15.1.0 to 15.1.1 in /backend 
Bumps [@hapi/joi](https://github.com/hapijs/joi) from 15.1.0 to 15.1.1.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v15.1.0...v15.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-16 04:19:32 +00:00
roschaefer
51b734275a The name of the hashtag is now it's ID 
`name` was just a redundant attribute
 2019-08-16 01:49:29 +02:00
kachulio1
314dfcf413 Throw error if no categories on post creation 
Co-authored-by: mattwr18 <mattwr18@gmail.com>
 2019-08-15 17:55:02 +03:00
Matt Rider
f0af231975 Merge branch '1017-send-out-notifications-on-create-omment' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 12:14:22 +02:00
Wolfgang Huß
6ab9a3204b Fix the backend test 2019-08-15 11:07:57 +02:00
Wolfgang Huß
0d66cc4dcf 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.js
#	backend/src/schema/types/schema.gql
 2019-08-15 10:16:33 +02:00
Matt Rider
569ace137b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-15 10:14:47 +02:00
dependabot-preview[bot]
31fa930ee2
Bump graphql-middleware from 3.0.3 to 3.0.5 in /backend 
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 3.0.3 to 3.0.5.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v3.0.3...v3.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-15 04:21:52 +00:00
Robert Schäfer
244a23a3dd
Merge pull request #1257 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.7.0 
Bump neo4j-graphql-js from 2.6.3 to 2.7.0 in /backend
 2019-08-14 23:52:51 +02:00
Wolfgang Huß
e8c1a5fe8d Write backend tests 2019-08-14 18:05:13 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories 
Localise categories
 2019-08-14 17:44:21 +02:00
Matt Rider
ee93efd6d9 Localise categories 2019-08-14 13:57:39 +02:00
Wolfgang Huß
67f25104f4 Fixing lint 2019-08-14 13:22:01 +02:00
Wolfgang Huß
825a5f235a Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-14 13:10:19 +02:00