147 Commits

Author SHA1 Message Date
ogerly
e737a3cd82 review alina add 2019-12-11 08:25:32 +01:00
ogerly
652f6d1edc fix reviews ContributionForm, ContributionForm.spec 2019-12-06 10:53:26 +01:00
ogerly
a62d59741b fix and changes revies, fix lint 2019-12-06 09:16:14 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +01:00
ogerly
b532a38966 lint fix 2019-12-04 15:23:16 +01:00
ogerly
7c26e84463 rename Blur() to blur() 2019-12-04 15:17:21 +01:00
ogerly
7b0b2cc93e rename checkedBlur to blurImage, testing checkbox 2019-12-04 15:14:57 +01:00
ogerly
6ce797e8ef test review 2019-12-04 11:20:27 +01:00
ogerly
fd3accd147 specs ok 2019-12-02 20:55:58 +01:00
Alina Beck
c75c8c6d2d pass imageAspectRatio to MasonryGridItems on user and more info page 2019-12-02 16:25:39 +03:00
ogerly
19d183e13a Merge https://github.com/Human-Connection/Human-Connection into 1746-Blur_explicit_Image_Content 2019-12-02 13:22:42 +01:00
ogerly
7cdca49b48 Fix lint 2019-11-29 16:04:25 +01:00
ogerly
06fd8a2ce9 unblur function by contribution 2019-11-29 12:14:54 +01:00
Moriz Wahl
3b49744b51 directory created a path names changed 2019-11-27 14:28:57 +01:00
Alina Beck
a210dd599d Merge branch 'master' into migrate-styleguide-icons 2019-11-20 19:35:03 +03:00
Alina Beck
77f4810ddc set up global localVue
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
2019-11-20 12:31:40 +03:00
Alina Beck
4e6572a042 replace ds-icon with base-icon 2019-11-19 12:26:07 +03:00
mattwr18
c775884c59
Merge pull request #2160 from Human-Connection/2119_Create_Post_consistent_form_input_validation
🍰 2119-Fix Contribution  consistent form input validation
2019-11-19 00:27:48 +01:00
mattwr18
123fc2f666 Fix lint with updated linter 2019-11-18 21:54:24 +01:00
mattwr18
6685ff3df0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2119_Create_Post_consistent_form_input_validation 2019-11-18 15:57:58 +01:00
Moriz Wahl
657a41ff7b Removed language method 2019-11-17 18:40:08 +01:00
Moriz Wahl
e46a23d445 css hyphens for webkit and moz 2019-11-11 23:01:03 +01:00
Moriz Wahl
d0c0fd373a Language attribute added to post and postCard 2019-11-11 22:42:37 +01:00
mattwr18
084388a21e Follow new file structure
- avoid nested directories
2019-11-11 08:50:35 +01:00
roschaefer
7c278d7c7f fix: send 403 if you try to edit another's post
This also fixes the glitch that you click on "Edit post" and the
contribution form is empty.
2019-11-08 17:30:29 +01:00
mattwr18
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +02:00
mattwr18
e37736500a Move comment to above relevant code 2019-10-18 19:05:00 +02:00
mattwr18
7e40295129 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 19:03:45 +02:00
roschaefer
25f2fc358d fix: console warnings during frontend tests 2019-10-18 00:21:43 +02:00
mattwr18
b800c7d5c9 Resolve pinnedAt undefinedToNull, clean up
- this was causing the noftications to break since they were using the
post fragment and pinnedAt was returning null
- remove unused bits of code
- revert changes to cypress since they were not causing the error
- can be changed in another PR
2019-10-18 00:01:46 +02:00
mattwr18
8b27250393 Fix vue warning webapp, try to find source of cypress failure
- clean up
2019-10-17 22:44:44 +02:00
roschaefer
3e04b26068 Add styling to pinned post 2019-10-17 17:56:16 +02:00
mattwr18
f871df02ae Start setting up frontend pinning/unpinning
- Add pin/unpin post to content menu
- Update apollo cache to reactively unpin
- Update apollo cache in root path to re-order Posts
- Order with pinned post first
- Start setting up filters, so that the pinned post is always the first
post visible
2019-10-17 17:56:16 +02:00
roschaefer
6a50ef6134 fix: storybook story of Comment.vue
This is the best solution that I can think of right now. Sure, it's not
so great to pass a property down from the page component. But at least
it fixes the storybook story, which is something.
2019-10-16 01:14:32 +02:00
mattwr18
b605dd12c5
Keep images from distorting or getting cropped
great explanation by @alina-beck

Co-Authored-By: Alina Beck <alina.beck@mail.com>
2019-10-14 19:15:22 +02:00
mattwr18
1c6b5f941b Remove aspect ratio on cropper, limit to max-height 2000px
- discussed it today's internal meeting and agreed upon with
@alina-beck, @Tirokk, @ogerly, @datenbrei, Dennis Hack

- max-height was a suggestion and can be changed at any time
2019-10-14 16:42:11 +02:00
mattwr18
908bc2a8c9
Merge pull request #1807 from Human-Connection/1669-show-edited-for-posts-comments
Show that a Post/Comment has been edited
2019-10-04 14:18:44 +02:00
roschaefer
3912b21ea2 refactor: use named slot for additional text
@mattwr18 I can see odd behaviour of the EDITED marker on mobile: The
text would just overlap.

The current behaviour has its flaws, e.g. if you have a long text it
won't wrap but overflow the comment card. But putting the additional
text into a named slot is certainly better than adding some nodes next
to the `<hc-user>` component.
2019-10-04 01:00:31 +02:00
mattwr18
a5e3c52e1d Show that a Post/Comment has been edited 2019-10-03 12:01:04 +02:00
mattwr18
4aeaa58eb6 Max aspect ratio of 1:1 for Post index page
- we are currently enforcing a 1:1 max ratio on the root path and would
like to maintain consistency
2019-10-02 16:53:24 +02:00
Vasily Belolapotkov
2c705a8680 sync with master to resolve merge conflicts 2019-09-29 20:33:39 +03:00
mattwr18
0f40df7cb4 Fix bug UpdateComment, Fix styling on Comment
- There was a bug that updates to comments were not being displayed
because of a v-show... https://vuejs.org/v2/guide/conditional.html#v-if-vs-v-show
Basically, what it says that is important for this bug is
"v-if...ensures that event listeners and child components inside the
conditional block are properly destroyed and re-created during toggles"

- Since we are using the editor to display comments in ContentViewer, we
need to set the min-height to 0px

- Co-authored-by: Alina Beck <alina.beck@mail.com>
- Co-authored-by: Robert Schäfer <git@roschaefer.de>
2019-09-25 13:39:18 +02:00
Vasily Belolapotkov
50feeed8bf fix the bug with scrolling post comments into view 2019-09-24 12:47:42 +03:00
Wolfgang Huß
22a005eb1c Show categories translated in all places and even in tooltips
Show `#` symbol in front of hashtags.
Minor design changes on posts more info page.
2019-09-16 11:14:13 +02:00
Wolfgang Huß
2c732bfbfb Refactor create and update comment to emit events 2019-09-09 15:53:50 +02:00
Wolfgang Huß
80d1e03c03
Merge pull request #1510 from Human-Connection/1506-anonymize_deleted_user
1506 Anonymize deleted user also for moderators
2019-09-06 17:12:31 +02:00
roschaefer
a053181334 Fix #1506 2019-09-06 13:29:53 +02:00
mattwr18
daf1ae864c Reuse css from ds-card-image, consistent width
- the width of the contribution form is now the same as the post card
2019-09-06 13:08:28 +02:00
Robert Schäfer
8d2ea9c4c0
Merge pull request #1474 from Human-Connection/cursor-fixes
Cursor fixes
2019-09-04 23:20:57 +02:00
Alina Beck
d1beed50d7 use masonry grid for related posts 2019-09-04 16:51:08 +01:00