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
dependabot-preview[bot]
176be03c48
Bump tiptap-extensions from 1.26.2 to 1.27.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.26.2 to 1.27.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.26.2...tiptap-extensions@1.27.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 15:26:30 +00:00
Robert Schäfer
0dbf3275e6
Merge pull request #1327 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.25.0 
Bump tiptap from 1.24.2 to 1.25.0 in /webapp
 2019-08-21 17:24:07 +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
3f9708183c
Merge pull request #1329 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/axios-5.6.0 
Bump @nuxtjs/axios from 5.5.4 to 5.6.0 in /webapp
 2019-08-21 16:03:21 +02:00
Robert Schäfer
834a3b11d9
Merge pull request #1330 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxt-dropzone-1.0.3 
Bump nuxt-dropzone from 1.0.2 to 1.0.3 in /webapp
 2019-08-21 16:01:34 +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
Robert Schäfer
ce4f3bdff3
Merge pull request #1336 from Human-Connection/fix-vue-warnings-masonry-grid 
Fix vue warnings for MasonryGrid/MasonGridItem
 2019-08-21 15:49:21 +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
be407080ef
Merge pull request #1318 from Human-Connection/dependabot/npm_and_yarn/webapp/sass-loader-7.3.1 
Bump sass-loader from 7.2.0 to 7.3.1 in /webapp
 2019-08-21 13:44:32 +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
9dd92b7cbe
Merge pull request #1325 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.0.0 
Bump date-fns from 2.0.0-beta.5 to 2.0.0 in /webapp
 2019-08-21 13:33:43 +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
Matt Rider
d1008cd0c7 Fix vue warnings 
- localVue.use(Styleguide) to register components
- find masonryGrid and emit event

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-08-21 13:17:32 +02:00
Matt Rider
c2d6723837 Fix cypress test, unique category ids/slugs 2019-08-21 10:50:56 +02:00
dependabot-preview[bot]
de9437d173
Bump @nuxtjs/axios from 5.5.4 to 5.6.0 in /webapp 
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.4 to 5.6.0.
- [Release notes](https://github.com/nuxt-community/axios-module/releases)
- [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/nuxt-community/axios-module/compare/v5.5.4...v5.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 08:10:39 +00:00
mattwr18
307692dc5b
Merge pull request #1309 from Human-Connection/dependabot/npm_and_yarn/webapp/nuxtjs/apollo-4.0.0-rc11 
Bump @nuxtjs/apollo from 4.0.0-rc9 to 4.0.0-rc11 in /webapp
 2019-08-21 10:07:40 +02:00
Matt Rider
e8871f51d4 Refactor cypress tests 
- add cypress command to createCategories to DRY out the steps
- remove step from background when isn't directly related to the setup
 2019-08-21 10:00:44 +02:00
mattwr18
8aa8be3152
Merge pull request #1314 from Human-Connection/1308-fix_broken_graphql_query 
Fix #1308
 2019-08-21 09:34:50 +02:00
mattwr18
a6cb159a8b
Merge pull request #1316 from Human-Connection/1315-fix_unique_constraint_bug_when_merging_a_new_hashtag 
Fix #1315
 2019-08-21 09:34:18 +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]
fa182cfd27
Bump nuxt-dropzone from 1.0.2 to 1.0.3 in /webapp 
Bumps [nuxt-dropzone](https://github.com/Etheryte/nuxt-dropzone) from 1.0.2 to 1.0.3.
- [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-21 04:31:23 +00: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]
620e7e82f0
Bump tiptap from 1.24.2 to 1.25.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.24.2 to 1.25.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.24.2...tiptap@1.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:29:52 +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]
096d4f249b
Bump date-fns from 2.0.0-beta.5 to 2.0.0 in /webapp 
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 04:28:56 +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
dependabot-preview[bot]
dc29169110
Bump sass-loader from 7.2.0 to 7.3.1 in /webapp 
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.2.0 to 7.3.1.
- [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.2.0...v7.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 04:25:26 +00:00
roschaefer
5c72799095 Fix #1315 2019-08-21 01:52:43 +02:00
Robert Schäfer
af5772db49
Merge pull request #1256 from Human-Connection/add-masonry-grid 
Add masonry layout grid
 2019-08-21 00:42:48 +02:00
roschaefer
ca24747550 Fix #1308 2019-08-20 23:53:10 +02:00
Matt Rider
c43ed33b7d Add categories for post creation Content.feature 2019-08-20 22:22:27 +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
dependabot-preview[bot]
575fd9fa97
Bump @nuxtjs/apollo from 4.0.0-rc9 to 4.0.0-rc11 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc9 to 4.0.0-rc11.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.9...v4.0.0-rc.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-20 17:10:15 +00: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
Alina Beck
626e9e24d4 use rowGap property with gridRowGap as fallback 2019-08-20 15:46:41 +01: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
Matt Rider
c614e4de47 Update UI, component tests 
- enforce that a post cannot be created or updated with no categories nor more than 3 categories
 2019-08-20 15:53:07 +02:00
roschaefer
c3edc92436 Fix lint 2019-08-20 14:06:24 +02:00