115 Commits

Author SHA1 Message Date
mattwr18
853ff9b92b Stub component, rename component, refactor
- We need to stub the Editor since it throws difficult to interpret
  errors about view.root.getSelection, but we want to stub it's methods
as well, so that we don't need a guard clause just for tests.

- CommentForm is already multiword
- Favor update over result for Vue apollo smart queries
2020-01-23 14:03:14 +01:00
mattwr18
d15037607c Add component test for direct reply to comment
- we have found it challenging to add component tests that mount the
  tiptap editor, so we are stubbing it, which means that we will add e2e
tests to up the coverage of how much of the workflow has automated tests
2020-01-23 13:05:36 +01:00
Alexander Friedland
9776efe760
Merge branch 'master' into 1680-Direct_answer_on_Comment 2020-01-22 11:46:04 +01:00
ogerly
21fa211e0c test: specs not ok, lint is ok 2020-01-22 11:31:23 +01:00
ogerly
00c0397919 test: specs is not ok 2020-01-22 11:25:44 +01:00
mattwr18
fdf00fc0c6 Follow @alina-beck's PR review suggestions
- Update styling
- Avoid nested tags
- Rename components with two names
- Add story

- Co-authored-by: Alina Beck <alina.beck@mail.com>
2020-01-20 10:04:30 +01:00
mattwr18
3132ac14a1 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-16 12:16:15 +01:00
Alina Beck
eaf738c12b replace last instance of ds-button with base-button 2020-01-15 16:13:47 +03:00
Alina Beck
a45d9749c8 Merge branch 'master' into button-migration-fixes 2020-01-15 14:35:05 +03:00
Alina Beck
90d1e50b9e refactor EmotionButton 2020-01-15 11:20:18 +03:00
ogerly
9d09dae2f4 slug from editor comands set 2020-01-14 18:36:35 +01:00
Mo Zargham
e0b6f82878 removed typo! 2019-12-29 14:09:20 -05:00
Mo Zargham
4b9040a8a7 fixed format 2019-12-29 14:06:53 -05:00
Mo Zargham
3db3cb1171 removed ternary added v-if 2019-12-27 15:17:13 -05:00
Mo Zargham
3234c2e861 added language tag for posts 2019-12-27 15:02:51 -05:00
Alina Beck
99a8efa8df fix emotions buttons markup 2019-12-19 01:03:35 +05:30
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
Alina Beck
5586335ed2 refactor css, fix design issues 2019-12-11 18:54:49 +03:00
ogerly
46db785550 fix lint, fix test 2019-12-11 10:33:10 +01:00
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
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
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
7616682a8e directory created a path names changed 2019-11-27 10:26:31 +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
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +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
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