16408 Commits

Author SHA1 Message Date
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
ALau2088
8c7009097a 552-update_comment 2019-05-24 08:22:56 -07:00
ALau2088
8a8ed5131e refactor backend and add UI 2019-05-24 08:03:39 -07: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
mattwr18
eb15e50c10
Merge pull request #648 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/node-7.4.5
Bump @babel/node from 7.2.2 to 7.4.5 in /backend
2019-05-24 01:14:59 -03:00
dependabot[bot]
d842493d91
Bump apollo-client from 2.5.1 to 2.6.0 in /webapp
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.5.1 to 2.6.0.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.5.1...apollo-client@2.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-24 03:04:34 +00:00
dependabot[bot]
3624254900
Bump @babel/node from 7.2.2 to 7.4.5 in /backend
Bumps [@babel/node](https://github.com/babel/babel) from 7.2.2 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.2.2...v7.4.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-24 03:04:26 +00:00
dependabot[bot]
38346ee21d
Bump @babel/preset-env from 7.4.4 to 7.4.5 in /backend
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 03:04:25 +00:00
mattwr18
4fb29e6aa8
Merge pull request #646 from Human-Connection/dependabot/npm_and_yarn/backend/@babel/core-7.4.5
Bump @babel/core from 7.4.4 to 7.4.5 in /backend
2019-05-24 00:02:31 -03:00
mattwr18
d083ee2a17
Merge pull request #645 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-cache-inmemory-1.6.0
Bump apollo-cache-inmemory from 1.5.1 to 1.6.0 in /backend
2019-05-24 00:02:08 -03:00
Matt Rider
d62f722381 Write component tests 2019-05-23 23:30:55 -03:00
3be82ec8a6
Merge pull request #657 from Human-Connection/dependabot/npm_and_yarn/backend/eslint-plugin-jest-22.6.4
Bump eslint-plugin-jest from 22.5.1 to 22.6.4 in /backend
2019-05-23 22:01:26 +02:00
Matt Rider
1c1d1a67ea Merge in master 2019-05-23 15:31:05 -03:00
Matt Rider
758bf215ac Merge branch 'master' of github.com:Human-Connection/Human-Connection into uploads-on-server 2019-05-23 15:26:19 -03:00
dependabot[bot]
73dd7d879f
Bump eslint-plugin-jest from 22.5.1 to 22.6.4 in /backend
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-23 18:24:57 +00:00
7287158181
Merge pull request #625 from Human-Connection/2019/kw20/fix_lint_rules_and_vscode
🍰 2019/kw20/fix_lint_rules_and_vscode
2019-05-23 20:22:33 +02:00
ce3d16c146
fixed test error caused by manual lint error fixing 2019-05-23 20:02:56 +02:00
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
cfd0975b24
backend linting 2019-05-23 19:23:03 +02:00
89ccf1fad0
Merge branch 'master' into 2019/kw20/fix_lint_rules_and_vscode 2019-05-23 19:19:13 +02:00
Wolfgang Huß
8bcb250951 Started to rewrite the tests of DeleteModal.vue 2019-05-23 10:22:36 +02:00
dependabot[bot]
c3b16e17ae
Bump tiptap from 1.19.8 to 1.20.1 in /webapp
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.8 to 1.20.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.8...tiptap@1.20.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-23 05:01:32 +00:00
dependabot[bot]
117255c8c0
Bump @nuxtjs/axios from 5.4.1 to 5.5.0 in /webapp
Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.4.1 to 5.5.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.4.1...v5.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-23 05:00:54 +00:00
dependabot[bot]
3b9351fdcb
Bump cypress-plugin-retries from 1.2.1 to 1.2.2
Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases)
- [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-23 04:55:48 +00:00
Matt Rider
18a4853874 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-22 13:52:17 -03:00
dependabot[bot]
4335ca3065
Bump @babel/core from 7.4.4 to 7.4.5 in /backend
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-22 04:52:49 +00:00
dependabot[bot]
30c9f7d451
Bump apollo-cache-inmemory from 1.5.1 to 1.6.0 in /backend
Bumps [apollo-cache-inmemory](https://github.com/apollographql/apollo-client) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-cache-inmemory@1.5.1...apollo-cache-inmemory@1.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-22 04:52:24 +00:00
mattwr18
99ae9770c6
Merge pull request #640 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.10
Bump tiptap-extensions from 1.19.8 to 1.19.10 in /webapp
2019-05-21 21:23:30 -03:00
mattwr18
d98f826cec
Merge pull request #639 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.6.1
Bump neo4j-graphql-js from 2.6.0 to 2.6.1 in /backend
2019-05-21 21:23:06 -03:00