148 Commits

Author SHA1 Message Date
mattwr18
36130d9d7c Check that stubbed component method is called 2020-01-27 13:44:40 +01:00
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
ogerly
73b005a900 test: added some test 2020-01-20 11:18:35 +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
Wolfgang Huß
377f2eecd2
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content
Blur Images
2019-12-19 11:46:38 +01:00
Alina Beck
99a8efa8df fix emotions buttons markup 2019-12-19 01:03:35 +05:30
mattwr18
e002ed0b49 Add back layout changes/update db_manipulation
- we had removed these changes till we could deploy them by themselves
and run the db_manipulation

Co-authored-by: Alina Beck <alina.beck@mail.com>
2019-12-18 15:39:42 +01:00
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
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01: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
mattwr18
fb4f487abd Revert layout changes for imageAspectRatio
- we still add the imageAspectRatio for new posts, but we don't do
anything with the layout until we figure out how to add
imageAspectRatios for every post with an image in the database without
causing a big downtime
2019-12-10 15:40:03 +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
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
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