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

972 Commits

Author SHA1 Message Date
Wolfgang Huß
04fe6b0a8c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleNotifications/handleNotificationsMiddleware.spec.js

Refactored there tests a little
 2019-08-22 11:02:10 +02:00
Wolfgang Huß
3e91a66673 Correct wrong merge of master 2019-08-22 08:32:19 +02:00
Robert Schäfer
deb0fcabd4
Merge pull request #1268 from Human-Connection/post-needs-to-have-category#1222 
Validate that a post cannot be created without categories/too many categories
 2019-08-21 16:28:32 +02:00
Robert Schäfer
4673908e2f
Merge pull request #1320 from Human-Connection/dependabot/npm_and_yarn/backend/date-fns-2.0.0 
Bump date-fns from 2.0.0-beta.5 to 2.0.0 in /backend
 2019-08-21 16:03:38 +02:00
Robert Schäfer
2cae56f391
Merge pull request #1328 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-testing-2.8.2 
Bump apollo-server-testing from 2.8.1 to 2.8.2 in /backend
 2019-08-21 15:49:48 +02:00
Wolfgang Huß
9a799657e9 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 
# Conflicts:
#	backend/src/middleware/handleHtmlContent/handleContentData.js
 2019-08-21 14:42:19 +02:00
Wolfgang Huß
3d2df56141 Backend tests 2019-08-21 14:27:32 +02:00
Robert Schäfer
bb7730d418
Merge pull request #1319 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-shield-6.0.5 
Bump graphql-shield from 6.0.4 to 6.0.5 in /backend
 2019-08-21 13:45:25 +02:00
Robert Schäfer
d8634a68b4
Merge pull request #1326 from Human-Connection/dependabot/npm_and_yarn/backend/sentry/node-5.6.2 
Bump @sentry/node from 5.6.1 to 5.6.2 in /backend
 2019-08-21 13:43:52 +02:00
dependabot-preview[bot]
c8287a0fd4
Bump date-fns from 2.0.0-beta.5 to 2.0.0 in /backend 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.0.0-beta.5 to 2.0.0.
- [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.5...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 11:36:11 +00:00
Robert Schäfer
f031cb3a18
Merge pull request #1322 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-server-2.8.2 
Bump apollo-server from 2.8.1 to 2.8.2 in /backend
 2019-08-21 13:34:15 +02:00
Robert Schäfer
7076e4e619
Merge pull request #1324 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-6.2.1 
Bump eslint from 6.2.0 to 6.2.1 in /backend
 2019-08-21 13:32:15 +02:00
Wolfgang Huß
d98ebdd713 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1062-notification-about-comment-on-post 2019-08-21 08:37:43 +02:00
dependabot-preview[bot]
01c21a1a9f
Bump apollo-server-testing from 2.8.1 to 2.8.2 in /backend 
Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.8.1 to 2.8.2.
- [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.8.1...apollo-server-testing@2.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:29:54 +00:00
dependabot-preview[bot]
843e2efb56
Bump @sentry/node from 5.6.1 to 5.6.2 in /backend 
Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 5.6.1 to 5.6.2.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.6.1...5.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:28:59 +00:00
dependabot-preview[bot]
14412d346f
Bump eslint from 6.2.0 to 6.2.1 in /backend 
Bumps [eslint](https://github.com/eslint/eslint) from 6.2.0 to 6.2.1.
- [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.0...v6.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:28:15 +00:00
dependabot-preview[bot]
6ab7f432e5
Bump apollo-server from 2.8.1 to 2.8.2 in /backend 
Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.8.1 to 2.8.2.
- [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.8.1...apollo-server@2.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:27:15 +00:00
dependabot-preview[bot]
fa11886eaa
Bump graphql-shield from 6.0.4 to 6.0.5 in /backend 
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 6.0.4 to 6.0.5.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v6.0.4...v6.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:25:30 +00:00
roschaefer
5c72799095 Fix #1315 2019-08-21 01:52:43 +02:00
Matt Rider
ea923ae1dc Merge branch 'master' of github.com:Human-Connection/Human-Connection into post-needs-to-have-category#1222 2019-08-20 21:29:10 +02:00
Matt Rider
512bf32b0c Update cypress tests, fix broken comment reactivity 2019-08-20 21:27:00 +02:00
Matt Rider
8735045d11 Update cypress tests, post query 2019-08-20 20:13:29 +02:00
Robert Schäfer
89b377fee1
Merge pull request #1281 from Human-Connection/272-add_error_reporting 
272 add error reporting
 2019-08-20 19:07:49 +02:00
Robert Schäfer
af377fd06c
Merge pull request #1298 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-config-standard-14.0.0 
Bump eslint-config-standard from 13.0.1 to 14.0.0 in /backend
 2019-08-20 19:05:07 +02:00
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
roschaefer
c3edc92436 Fix lint 2019-08-20 14:06:24 +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
dependabot-preview[bot]
d5d1dd77cd
Bump eslint-config-standard from 13.0.1 to 14.0.0 in /backend 
Bumps [eslint-config-standard](https://github.com/standard/eslint-config-standard) from 13.0.1 to 14.0.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/v13.0.1...v14.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 10:09:18 +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
Wolfgang Huß
83a538d345 Write backend tests 
Rename files.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-08-19 22:13:42 +02:00
roschaefer
58795ad990 Implement error reporting for the backend 2019-08-19 20:14:43 +02: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
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
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