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
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
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
Matt Rider
d62f722381
Write component tests
2019-05-23 23:30:55 -03: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
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
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
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
Matt Rider
fd90006dff
Merge branch 'uploads-on-server' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads
2019-05-21 17:32:02 -03:00
aonomike
beeb7bb947
Change ds-avatar size to x-large
2019-05-21 23:26:51 +03:00
Matt Rider
4ac8c7f06b
Fix failing tests
2019-05-21 16:53:50 -03:00
Matt Rider
610a7f6bfe
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads
2019-05-21 16:15:45 -03:00
Robert Schäfer
834473e978
Merge pull request #622 from Human-Connection/2019/kw20/fix_post_card_design
...
🍰 2019/kw20/fix_post_card_design
2019-05-21 15:30:44 +02:00
dependabot[bot]
4942ca7a29
Bump tiptap-extensions from 1.19.8 to 1.19.10 in /webapp
...
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap ) from 1.19.8 to 1.19.10.
- [Release notes](https://github.com/scrumpy/tiptap/releases )
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.8...tiptap-extensions@1.19.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-21 04:54:00 +00:00
dependabot[bot]
aa1998ffce
Bump tiptap from 1.19.3 to 1.19.8 in /webapp
...
Bumps [tiptap](https://github.com/scrumpy/tiptap ) from 1.19.3 to 1.19.8.
- [Release notes](https://github.com/scrumpy/tiptap/releases )
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.3...tiptap@1.19.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-21 00:04:52 +00:00
Matt Rider
73fc0a420c
Improve CSS, add key to rerender Upload
...
- re-renders when avatar is successful updated
2019-05-20 17:30:51 -03:00
Matt Rider
5cd50ee00d
Remove apollo-upload-client
...
- we are using graphql-client, which under the hood uses apollo-upload-client
2019-05-20 16:42:13 -03:00
Matt Rider
d463312397
Get avatar upload working from frontend to backend
...
- there are several things to work on still
- the upload sets the avatar as the background image of the previewElement, which means that you must refresh the page to upload a different avatar
- the CSS is slightly different before and after successful upload
- the CSS is slightly broken in that the avatar is not in the "ideal" place, it is entirely inside the card, instead of half in, half out on the top
2019-05-20 16:37:02 -03:00
Matt Rider
3df7f588d2
Merge branch '399-user-profile-image-uploads' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads
2019-05-20 15:39:57 -03:00
Matt Rider
f60af6a704
Merge github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads
2019-05-20 15:38:30 -03:00
Matt Rider
1bb523a9ef
Set up to work with vddrop
...
- on vdropzone-drop call vddrop function, which sends the mutation to the backend
2019-05-20 15:37:08 -03:00
Matt Rider
1c072b97b5
Add apollo-upload-client
2019-05-20 13:20:24 -03:00
Wolfgang Huß
7e922fa0b0
Got the go to Index Page to work on Post Page deletion
2019-05-20 07:00:33 +02:00
dependabot[bot]
f27c8c5cc3
Bump tiptap-extensions from 1.19.4 to 1.19.8 in /webapp
...
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap ) from 1.19.4 to 1.19.8.
- [Release notes](https://github.com/scrumpy/tiptap/releases )
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.4...tiptap-extensions@1.19.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-20 04:59:07 +00:00
Wolfgang Huß
8d6e3794cf
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 553-delete-comment
2019-05-20 06:08:55 +02:00
Robert Schäfer
d73ec2288e
Merge pull request #626 from Human-Connection/613_revert-empty-component-to-use-img-tag
...
Refactor to use <img> instead of <hc-image> component for images
2019-05-19 19:25:44 +02:00
Wolfgang Huß
f5d9bc9ae4
First proof of functionality for Delete Comment and Post via DeleteModal
2019-05-19 12:54:25 +02:00
Wolfgang Huß
7f83f775a7
Clean up the delete-menu stuff for Comments and Posts
2019-05-19 08:23:51 +02:00
Wolfgang Huß
2016a9445b
Rename confirm callbacks
2019-05-19 07:42:55 +02:00
Wolfgang Huß
388e9ff6b2
Go ahead with refactoring of DeleteModal in Comments and Posts
2019-05-18 15:56:07 +02:00
c7070fe4d6
fixes
2019-05-18 15:26:30 +02:00
afbfd00bec
jest plugin for eslint
2019-05-18 15:22:49 +02:00
9edce764e3
dependencies
2019-05-18 15:18:48 +02:00
1dc8f1a15f
dependencies
2019-05-18 15:17:56 +02:00
beab5571fd
included license and author in package.json
2019-05-18 15:12:31 +02:00
d9bd264106
updated package json
2019-05-18 15:11:37 +02:00
1e20bb4bce
updated package json
2019-05-18 15:08:57 +02:00
