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

391 Commits

Author SHA1 Message Date
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
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]
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
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
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
Robert Schäfer
03bf8fb3d5 Merge remote-tracking branch 'origin/master' into 399-user-profile-image-uploads 2019-05-18 13:52:24 +02:00
Robert Schäfer
b7632ed1fa Follow "folder with spec and component" convention 2019-05-18 13:49:13 +02:00
Ulf Gebhardt
df3ec92cf1
Merge branch 'master' into 2019/kw20/fix_post_card_design 2019-05-18 13:01:40 +02:00
Ulf Gebhardt
a7fb3f0095
linting 2019-05-18 12:36:51 +02:00
Ulf Gebhardt
eda58c25e3
ribbon tests, ribbon positions, fixed ssr stuff, fied missing language things 2019-05-18 12:33:41 +02:00
Ulf Gebhardt
7095e38947
fixed post card design 2019-05-17 23:10:10 +02:00
Robert Schäfer
ee1af607de
Merge pull request #619 from Human-Connection/dependabot/npm_and_yarn/webapp/express-4.17.0 
Bump express from 4.16.4 to 4.17.0 in /webapp
 2019-05-17 22:40:34 +02:00
Robert Schäfer
f952e131e0
Merge pull request #620 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-config-prettier-4.3.0 
Bump eslint-config-prettier from 4.2.0 to 4.3.0 in /webapp
 2019-05-17 22:40:08 +02:00
Matt Rider
abcabc460f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-17 07:33:14 -03:00
dependabot[bot]
1095d98131
Bump @nuxtjs/apollo from 4.0.0-rc4.1 to 4.0.0-rc4.2 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc4.1 to 4.0.0-rc4.2.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.4.1...v4.0.0-rc.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:52:11 +00:00
dependabot[bot]
505098dd2d
Bump eslint-config-prettier from 4.2.0 to 4.3.0 in /webapp 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:51:47 +00:00
dependabot[bot]
8df1648c5e
Bump express from 4.16.4 to 4.17.0 in /webapp 
Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.0.
- [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.16.4...4.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-17 04:51:10 +00:00
Matt Rider
6825c58e0a Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.4 2019-05-17 00:10:16 -03:00
Matt Rider
95e2667a9b Add negative margin 2019-05-17 00:06:44 -03:00
Matt Rider
bb5b24cf07 Update to use custom styling, remove backgroundImage 
- Merge in master
 2019-05-16 15:56:20 -03:00
aonomike
29c9adc373 Refactor to use <img> instead of <hc-image> component for images 2019-05-16 16:36:25 +03:00
Matt Rider
49e19a3bd7 Set avatar as background image of vue-dropzone 2019-05-16 07:42:48 -03:00
dependabot[bot]
f001f7b5e3
Bump tiptap from 1.19.2 to 1.19.3 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.3.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.2...tiptap@1.19.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 04:46:33 +00:00
dependabot[bot]
75d54130ea
Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.4.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.2...tiptap-extensions@1.19.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-16 04:45:56 +00:00
dependabot[bot]
626fcfdc11
Bump nuxt from 2.6.3 to 2.7.1 in /webapp 
Bumps [nuxt](https://github.com/nuxt/nuxt.js) from 2.6.3 to 2.7.1.
- [Release notes](https://github.com/nuxt/nuxt.js/releases)
- [Changelog](https://github.com/nuxt/nuxt.js/blob/dev/RELEASE_PLAN.md)
- [Commits](https://github.com/nuxt/nuxt.js/compare/v2.6.3...2.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-15 10:47:07 +00:00
Matt Rider
87debd2a92 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-15 07:44:08 -03:00
Matt Rider
1d11f5d574 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/tiptap-1.19.2 2019-05-15 00:28:54 -03:00
mattwr18
1f1cdd0826
Merge pull request #601 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.19.2 
Bump tiptap-extensions from 1.19.1 to 1.19.2 in /webapp
 2019-05-15 00:26:18 -03:00
mattwr18
57556e8a8d
Merge pull request #604 from Human-Connection/dependabot/npm_and_yarn/webapp/@nuxtjs/apollo-4.0.0-rc4.1 
Bump @nuxtjs/apollo from 4.0.0-rc4 to 4.0.0-rc4.1 in /webapp
 2019-05-15 00:25:51 -03:00
mattwr18
b233255501
Merge pull request #598 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-prettier-3.1.0 
Bump eslint-plugin-prettier from 3.0.1 to 3.1.0 in /webapp
 2019-05-15 00:25:26 -03:00
Matt Rider
a04bc977d4 Fix lint 
- still not automated
 2019-05-14 20:57:49 -03:00
Matt Rider
24a6ec88ad Add nuxt-dropzone, Upload component 2019-05-14 17:19:00 -03:00
dependabot[bot]
9078d00fa1
Bump @nuxtjs/apollo from 4.0.0-rc4 to 4.0.0-rc4.1 in /webapp 
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc4 to 4.0.0-rc4.1.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.4...v4.0.0-rc.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 04:55:46 +00:00
dependabot[bot]
7d1c4e181d
Bump tiptap from 1.19.0 to 1.19.2 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.0 to 1.19.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.0...tiptap@1.19.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 04:54:49 +00:00
dependabot[bot]
62c639a9f8
Bump tiptap-extensions from 1.19.1 to 1.19.2 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.1...tiptap-extensions@1.19.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 04:54:16 +00:00
Robert Schäfer
74109256b2
Merge pull request #594 from Human-Connection/296-image_component-leftover 
Revert logout.vue
 2019-05-13 12:40:01 +02:00
dependabot[bot]
4a021db36b
Bump eslint-plugin-prettier from 3.0.1 to 3.1.0 in /webapp 
Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.0.1...v3.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-13 04:49:20 +00:00
dependabot[bot]
dc28ad38fd
Bump tiptap-extensions from 1.17.0 to 1.19.1 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.17.0 to 1.19.1.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.17.0...tiptap-extensions@1.19.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-11 00:04:35 +00:00
mattwr18
76005d91e3
Merge pull request #592 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.19.0 
Bump tiptap from 1.17.0 to 1.19.0 in /webapp
 2019-05-10 21:02:21 -03:00
Matt Rider
7fc8f2ecb7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 296-image_component-leftover 2019-05-10 14:04:51 -03:00
Ulf Gebhardt
fe386e2355
Merge pull request #595 from Human-Connection/delete-posts 
Delete posts
 2019-05-10 16:55:59 +02:00