|
|
340a26fc5d
|
Merge pull request #585 from Human-Connection/doc-update-minikube-setup-documentation
More descriptive minikube setup instructions
|
2019-05-27 15:20:19 +02:00 |
|
Robert Schäfer
|
fb0e6f5abd
|
Use our own fork to workaround #600 for now
|
2019-05-27 15:15:13 +02:00 |
|
mattwr18
|
a21fb27351
|
Merge pull request #605 from Human-Connection/399-user-profile-image-uploads
User profile image uploads
|
2019-05-27 09:32:04 -03:00 |
|
mattwr18
|
bfb4e06a35
|
Merge pull request #636 from Human-Connection/uploads-on-server
Image upload backend implementation
|
2019-05-27 09:28:00 -03:00 |
|
dependabot-preview[bot]
|
44165a12a1
|
Bump express from 4.17.0 to 4.17.1 in /backend
Bumps [express](https://github.com/expressjs/express) from 4.17.0 to 4.17.1.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.0...4.17.1)
|
2019-05-27 11:23:02 +00:00 |
|
dependabot-preview[bot]
|
1256660d43
|
Bump eslint-plugin-import from 2.17.2 to 2.17.3 in /backend
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.2 to 2.17.3.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.2...v2.17.3)
|
2019-05-27 11:22:26 +00:00 |
|
Robert Schäfer
|
e241267e90
|
Merge pull request #678 from Human-Connection/dependabot/npm_and_yarn/backend/nodemon-1.19.1
Bump nodemon from 1.19.0 to 1.19.1 in /backend
|
2019-05-27 13:21:53 +02:00 |
|
Robert Schäfer
|
2c7d649d25
|
Merge pull request #680 from Human-Connection/dependabot/npm_and_yarn/webapp/nodemon-1.19.1
Bump nodemon from 1.19.0 to 1.19.1 in /webapp
|
2019-05-27 13:21:35 +02:00 |
|
Robert Schäfer
|
c39647909c
|
Merge pull request #681 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.2
Bump @nuxtjs/axios from 5.5.1 to 5.5.2 in /webapp
|
2019-05-27 13:21:17 +02:00 |
|
Robert Schäfer
|
21c3dafe41
|
Merge pull request #682 from Human-Connection/dependabot/npm_and_yarn/webapp/express-4.17.1
Bump express from 4.17.0 to 4.17.1 in /webapp
|
2019-05-27 13:20:49 +02:00 |
|
Robert Schäfer
|
8d3fc4df41
|
Merge pull request #683 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.17.3
Bump eslint-plugin-import from 2.17.2 to 2.17.3 in /webapp
|
2019-05-27 13:20:27 +02:00 |
|
Wolfgang Huß
|
f9fe4f742f
|
Lint fixes
|
2019-05-27 12:39:37 +02:00 |
|
Wolfgang Huß
|
68980f85c6
|
Merge remote-tracking branch 'origin/master' into 553-delete-comment
# Conflicts:
# webapp/components/Comment.vue
# webapp/components/ContentMenu.vue
# webapp/components/Modal/DeleteModal.spec.js
# webapp/components/Modal/DeleteModal.vue
# webapp/components/Modal/DisableModal.spec.js
# webapp/components/Modal/DisableModal.vue
# webapp/components/Modal/ReportModal.spec.js
# webapp/components/Modal/ReportModal.vue
# webapp/components/PostCard/index.vue
# webapp/components/comments/CommentList/index.vue
# webapp/locales/de.json
# webapp/pages/index.vue
# webapp/pages/profile/_id/_slug.vue
|
2019-05-27 12:34:59 +02:00 |
|
dependabot-preview[bot]
|
7d5673272b
|
Bump eslint-plugin-import from 2.17.2 to 2.17.3 in /webapp
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.17.2 to 2.17.3.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.17.2...v2.17.3)
|
2019-05-27 05:18:54 +00:00 |
|
dependabot-preview[bot]
|
4dc3adc31d
|
Bump express from 4.17.0 to 4.17.1 in /webapp
Bumps [express](https://github.com/expressjs/express) from 4.17.0 to 4.17.1.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.0...4.17.1)
|
2019-05-27 05:18:38 +00:00 |
|
dependabot-preview[bot]
|
57e3b51c96
|
Bump @nuxtjs/axios from 5.5.1 to 5.5.2 in /webapp
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.1 to 5.5.2.
- [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.1...v5.5.2)
|
2019-05-27 05:18:00 +00:00 |
|
dependabot-preview[bot]
|
e40f574221
|
Bump nodemon from 1.19.0 to 1.19.1 in /webapp
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.0...v1.19.1)
|
2019-05-27 05:17:35 +00:00 |
|
dependabot-preview[bot]
|
b3b7921e7b
|
Bump @vue/cli-shared-utils from 3.7.0 to 3.8.0 in /webapp
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.8.0/packages/@vue/cli-shared-utils)
|
2019-05-27 05:17:15 +00:00 |
|
dependabot-preview[bot]
|
c96652423b
|
Bump nodemon from 1.19.0 to 1.19.1 in /backend
Bumps [nodemon](https://github.com/remy/nodemon) from 1.19.0 to 1.19.1.
- [Release notes](https://github.com/remy/nodemon/releases)
- [Commits](https://github.com/remy/nodemon/compare/v1.19.0...v1.19.1)
|
2019-05-27 05:08:34 +00:00 |
|
Robert Schäfer
|
924edfad8e
|
Merge pull request #670 from Human-Connection/dependabot/npm_and_yarn/webapp/graphql-14.3.1
Bump graphql from 14.3.0 to 14.3.1 in /webapp
|
2019-05-26 13:04:17 +02:00 |
|
Robert Schäfer
|
4c900850e2
|
Merge pull request #671 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.6.4
Bump eslint-plugin-jest from 22.5.1 to 22.6.4 in /webapp
|
2019-05-26 13:03:46 +02:00 |
|
dependabot-preview[bot]
|
5634a84664
|
Bump eslint-plugin-jest from 22.5.1 to 22.6.4 in /webapp
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.5.1 to 22.6.4.
- [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.5.1...v22.6.4)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-25 00:28:14 +00:00 |
|
mattwr18
|
319d318b4c
|
Merge pull request #673 from Human-Connection/dependabot/npm_and_yarn/webapp/tar-2.2.2
[Security] Bump tar from 2.2.1 to 2.2.2 in /webapp
|
2019-05-24 21:26:06 -03:00 |
|
dependabot-preview[bot]
|
a6c392987e
|
Bump graphql from 14.3.0 to 14.3.1 in /webapp
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.3.0 to 14.3.1.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.3.0...v14.3.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 22:34:10 +00:00 |
|
mattwr18
|
1630c57761
|
Merge pull request #669 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-node-9.1.0
Bump eslint-plugin-node from 9.0.1 to 9.1.0 in /webapp
|
2019-05-24 19:33:50 -03:00 |
|
mattwr18
|
a84e97c610
|
Merge pull request #668 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.1
Bump @nuxtjs/axios from 5.5.0 to 5.5.1 in /webapp
|
2019-05-24 19:33:23 -03:00 |
|
mattwr18
|
dfc6d2b220
|
Merge pull request #667 from Human-Connection/dependabot/npm_and_yarn/cypress-3.3.1
Bump cypress from 3.3.0 to 3.3.1
|
2019-05-24 19:32:57 -03:00 |
|
mattwr18
|
456ee1dbdb
|
Merge pull request #666 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-14.3.1
Bump graphql from 14.3.0 to 14.3.1 in /backend
|
2019-05-24 19:31:59 -03:00 |
|
mattwr18
|
a82672ddcb
|
Merge pull request #665 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-node-9.1.0
Bump eslint-plugin-node from 9.0.1 to 9.1.0 in /backend
|
2019-05-24 19:31:34 -03:00 |
|
dependabot-preview[bot]
|
17a081d2f5
|
[Security] Bump tar from 2.2.1 to 2.2.2 in /webapp
Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/npm/node-tar/releases)
- [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2)
|
2019-05-24 22:31:33 +00:00 |
|
mattwr18
|
df86209ee1
|
Merge pull request #661 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.20.1
Bump tiptap-extensions from 1.19.10 to 1.20.1 in /webapp
|
2019-05-24 19:30:06 -03:00 |
|
mattwr18
|
c777a8ca89
|
Merge pull request #655 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/preset-env-7.4.5
Bump @babel/preset-env from 7.4.4 to 7.4.5 in /webapp
|
2019-05-24 19:29:37 -03:00 |
|
mattwr18
|
76ab25c152
|
Merge pull request #653 from Human-Connection/dependabot/npm_and_yarn/webapp/@babel/core-7.4.5
Bump @babel/core from 7.4.4 to 7.4.5 in /webapp
|
2019-05-24 19:29:03 -03:00 |
|
Matt Rider
|
39d4771ce1
|
Fix lint
|
2019-05-24 08:48:52 -03:00 |
|
Matt Rider
|
51d25c1c9a
|
Work through merge conflict
|
2019-05-24 08:23:50 -03:00 |
|
Matt Rider
|
460d081d52
|
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads
|
2019-05-24 08:10:17 -03:00 |
|
dependabot[bot]
|
597ec1443c
|
Bump eslint-plugin-node from 9.0.1 to 9.1.0 in /webapp
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.0.1 to 9.1.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.0.1...v9.1.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 05:02:01 +00:00 |
|
dependabot[bot]
|
a08d5c113f
|
Bump @nuxtjs/axios from 5.5.0 to 5.5.1 in /webapp
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.5.0 to 5.5.1.
- [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.0...v5.5.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 05:01:30 +00:00 |
|
dependabot[bot]
|
c89f9143a6
|
Bump cypress from 3.3.0 to 3.3.1
Bumps [cypress](https://github.com/cypress-io/cypress) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.3.0...v3.3.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 04:57:49 +00:00 |
|
dependabot[bot]
|
e4fe58035c
|
Bump graphql from 14.3.0 to 14.3.1 in /backend
Bumps [graphql](https://github.com/graphql/graphql-js) from 14.3.0 to 14.3.1.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](https://github.com/graphql/graphql-js/compare/v14.3.0...v14.3.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 04:52:11 +00:00 |
|
dependabot[bot]
|
5b21107f9e
|
Bump eslint-plugin-node from 9.0.1 to 9.1.0 in /backend
Bumps [eslint-plugin-node](https://github.com/mysticatea/eslint-plugin-node) from 9.0.1 to 9.1.0.
- [Release notes](https://github.com/mysticatea/eslint-plugin-node/releases)
- [Commits](https://github.com/mysticatea/eslint-plugin-node/compare/v9.0.1...v9.1.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 04:51:46 +00:00 |
|
mattwr18
|
9d1dfe6067
|
Merge pull request #654 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.0
Bump apollo-client from 2.5.1 to 2.6.0 in /webapp
|
2019-05-24 01:28:44 -03:00 |
|
Matt Rider
|
cebd1046c7
|
Write cypress tests, show dropzone conditionally
- If it's the user's profile, show vueDropzone, if not show just the user's avatar
- apollo mutation is being called twice for drag and drop events
|
2019-05-24 01:26:37 -03:00 |
|
dependabot[bot]
|
fcf6b394f3
|
Bump tiptap-extensions from 1.19.10 to 1.20.1 in /webapp
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.10 to 1.20.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.10...tiptap-extensions@1.20.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 04:19:27 +00:00 |
|
dependabot[bot]
|
abfe710d61
|
Bump @babel/preset-env from 7.4.4 to 7.4.5 in /webapp
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.4.5)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 04:17:10 +00:00 |
|
dependabot[bot]
|
06ba5f8f5b
|
Bump @babel/core from 7.4.4 to 7.4.5 in /webapp
Bumps [@babel/core](https://github.com/babel/babel) from 7.4.4 to 7.4.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.4.5)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2019-05-24 04:17:09 +00:00 |
|
mattwr18
|
57521495d5
|
Merge pull request #660 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.20.1
Bump tiptap from 1.19.8 to 1.20.1 in /webapp
|
2019-05-24 01:17:08 -03:00 |
|
mattwr18
|
0455142eef
|
Merge pull request #659 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/axios-5.5.0
Bump @nuxtjs/axios from 5.4.1 to 5.5.0 in /webapp
|
2019-05-24 01:16:37 -03:00 |
|
mattwr18
|
72342e93d9
|
Merge pull request #658 from Human-Connection/dependabot/npm_and_yarn/cypress-plugin-retries-1.2.2
Bump cypress-plugin-retries from 1.2.1 to 1.2.2
|
2019-05-24 01:15:54 -03:00 |
|
mattwr18
|
df2acbd546
|
Merge pull request #649 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/preset-env-7.4.5
Bump @babel/preset-env from 7.4.4 to 7.4.5 in /backend
|
2019-05-24 01:15:25 -03:00 |
|
