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

441 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Ulf Gebhardt
ce3d16c146
fixed test error caused by manual lint error fixing 2019-05-23 20:02:56 +02:00
Ulf Gebhardt
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
Ulf Gebhardt
89ccf1fad0
Merge branch 'master' into 2019/kw20/fix_lint_rules_and_vscode 2019-05-23 19:19:13 +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