ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

5716 Commits

Author SHA1 Message Date
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
Wolfgang Huß
a9617c8b62 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 553-delete-comment 2019-05-16 10:16:34 +02: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
Wolfgang Huß
1acf109dba Implemented Menus, Unit Tests and created and refactored localisations 2019-05-15 16:48:50 +02: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
Ulf Gebhardt
c176ce738a
Merge pull request #556 from Human-Connection/554-add-component-test-CommentForm 
Write component tests for CommentForm.vue
 2019-05-10 16:30:54 +02:00
Robert Schäfer
c0dc0e2d3d Revert logout.vue 
For any static image URL we don't need to use `<hc-image>`. The assets
will be served from the frontend container. I did not anticipate that we
have a lot of static images in the frontend when I said "You can remove
every image with the `<hc-image>` component".

@aonomike: In the future you can make some screenshots and post them in the PR
and ask for help.

@ulfgebhardt: Yes, it would have been safer not to merge the PR. We
might run into the danger of forgetting things like this.
 2019-05-10 15:36:36 +02:00
Matt Rider
bb306cad49 Update other ds-avatar sizes 2019-05-10 10:30:02 -03:00
Matt Rider
c28c51d86f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 586-deal-with-yarn-warn-due-to-invalid-size-prop 2019-05-10 10:20:23 -03:00
Ulf Gebhardt
0712b3c0dc
Merge pull request #551 from Human-Connection/2019/kw15/change_password_strength 
2019/kw15/change password strength
 2019-05-10 15:13:22 +02:00
Ulf Gebhardt
d0fb12d7ad
fixed comment 2019-05-10 14:38:34 +02:00
Ulf Gebhardt
dd8f9deb67
fixed lint error, refactored whole modules - its now small and neat! 2019-05-10 14:32:21 +02:00
Robert Schäfer
6c5f529d85 Couple of corrections 
@aonomike use computed properties when possible
 2019-05-10 13:58:24 +02:00
Robert Schäfer
958ebf2c77 No need to use <hc-image> for static URLs 
@aonomike OK, sorry. When I said that we can replace all `<img>` tags,
what I meant is that we can replace every img tag that has a dynamic
`:src` attribute.
 2019-05-10 13:42:27 +02:00
Robert Schäfer
51ed1604a0 Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-10 13:42:21 +02:00
Robert Schäfer
1db35be50f Merge remote-tracking branch 'origin/master' into 296-image_component 2019-05-10 13:30:06 +02:00
Ulf Gebhardt
15d03f18f7
fixed strength meter 2019-05-10 12:21:24 +02:00
dependabot[bot]
9df0302a9b
Bump tiptap from 1.17.0 to 1.19.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.17.0 to 1.19.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.17.0...tiptap@1.19.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-10 04:49:27 +00:00
mattwr18
12b326c992
Merge pull request #564 from Human-Connection/dependabot/npm_and_yarn/webapp/@human-connection/styleguide-0.5.17 
Bump @human-connection/styleguide from 0.5.15 to 0.5.17 in /webapp
 2019-05-10 00:00:49 -03:00
mattwr18
d63cc3a43e
Merge pull request #579 from Human-Connection/dependabot/npm_and_yarn/webapp/tippy.js-4.3.1 
Bump tippy.js from 4.3.0 to 4.3.1 in /webapp
 2019-05-09 23:59:39 -03:00
Matt Rider
0d243b225e Fix lint 
- when will this be automated!!!
 2019-05-09 15:53:01 -03:00
Matt Rider
6e675c74d5 Update ds-avatar size to use small 2019-05-09 15:34:24 -03:00
aonomike
e55129c64b Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-09 21:04:46 +03:00
aonomike
6445c534b4 Refactor to pass imageProps as an object without the computed section 2019-05-09 21:04:07 +03:00
Matt Rider
71f3dd73aa Update tests 2019-05-09 15:03:54 -03:00
Matt Rider
3c8a59c01b Merge branch '2019/kw15/change_password_strength' of github.com:Human-Connection/Human-Connection into 2019/kw15/change_password_strength 2019-05-09 14:32:36 -03:00
Matt Rider
c0907dd7c5 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2019/kw15/change_password_strength 2019-05-09 14:32:29 -03:00
Matt Rider
26f090daa4 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 554-add-component-test-CommentForm 2019-05-09 14:05:38 -03:00
mattwr18
bb6c9088d4
Merge pull request #575 from Human-Connection/572-downgrade-tiptap-due-to-bug-introduced-in-newer-version 
Revert tiptap upgrade
 2019-05-09 13:27:10 -03:00
Ulf Gebhardt
aa80d7492d
Merge branch 'master' into delete-posts 2019-05-09 15:05:47 +02:00