812 Commits

Author SHA1 Message Date
Alina Beck
d2148bdd47 Merge branch 'master' into migrate-styleguide-card 2020-02-03 19:23:22 +01:00
mattwr18
34ec61153a
Fix typo (#2966) 2020-02-03 15:06:08 +01:00
mattwr18
701411e270 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1680-Direct_answer_on_Comment 2020-01-31 13:08:31 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
Moriz Wahl
a4907f2bcb localised error message for cannot edit post 2020-01-28 10:18:15 +01:00
Moriz Wahl
9948f4ef20 improved layout, key-name changed 2020-01-28 10:18:15 +01:00
Moriz Wahl
7cfd61ecf2 Error page added 2020-01-28 10:18:15 +01:00
mattwr18
36130d9d7c Check that stubbed component method is called 2020-01-27 13:44:40 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
2020-01-23 19:18:12 +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
Alina Beck
e7bf499d37 use BaseCard in Comment component and refactor 2020-01-22 17:37:32 +03: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
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +01:00
mattwr18
704b8c2d57 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-21 21:15:03 +01:00
mattwr18
2df4e463f8 Update/Add translations for placeholder message
- @alina-beck, I had a look at the Placeholder component and it's quite
  simple, but I guess migrating that is a separate PR, but I don't know
aobut adding more ds-placeholders, do you have some design ideas on what
could look better?
2020-01-21 19:28:19 +01:00
mattwr18
c7ee90e980 Follow @roschaefer PR suggestions
- As blocking is now reciprocal, we do not need another query, we can
  use neo4j-graphql-js magic to query for a BLOCKED relationship between
the postAuthor and the currentUser
2020-01-21 18:50:46 +01:00
mattwr18
769c0cd105 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2 2020-01-21 17:08:51 +01:00
mattwr18
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content
feat: Convert block/unblock to mute/unmute
2020-01-21 17:05:09 +01:00
Alina Beck
287e9ce484 remove unused trunc prop 2020-01-21 17:00:37 +03:00
ogerly
73b005a900 test: added some test 2020-01-20 11:18:35 +01:00
mattwr18
74a7db5388 Convert missed ds-avatar, fix cypress test 2020-01-20 10:08:27 +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
905f34c827 Support use of initials, add tests, move component
- if there is no user.avatar, we show a user's initials - up to 3
characters unless there is no name or the name is 'Anonymous'. This is
to support users who on the old alpha were allowed to be anonymous (do
we still want to support this?)

- Add test cases for ☝️
- Refactor to not use any styleguide components and move UserAvatar to
generic directory
2020-01-20 10:04:30 +01:00
mattwr18
068e2b4417 Fix styling, renaming classes 2020-01-20 10:04:30 +01:00
mattwr18
b090b1177f Migrate the bare minimum
- follow @alina-beck PR review
2020-01-20 10:04:30 +01:00
Robert Schäfer
d3473050c4
Merge pull request #2725 from Human-Connection/2229_remove_obsolete_translation
fix(translations): Remove duplicate and mistranslated item from code of conduct
2020-01-17 22:28:10 +01:00
roschaefer
c22a6330aa refactor(translations): Fix keys for muting
Provide the correct German translation. Remove "" and use `null` for
Italian. @mattwr18 we really have to make sure not to add empty strings
to our translations because we disable the fallback in that case. Also,
if we want, we could replace the other translations with `null` in order
to make sure that we have the better (though untranslated) explanation.

@mattwr18 I had a look into `notificationsMiddleware.js`. I think that
we can still keep the tests and the behaviour although there is no
`BLOCKED` relationship anymore, right?
2020-01-16 20:56:12 +01:00
roschaefer
c5a6919833 Merge remote-tracking branch 'origin/master' into 279-blacklist-users-content 2020-01-16 19:48:16 +01:00
mattwr18
0a4defe36d Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 14:52:58 +01:00
mattwr18
851babeac3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-16 14:48:56 +01:00
mattwr18
83491e15c8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 13:19:33 +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
mattwr18
81cbb7a85c Refactor styling, fix naming convention
- Emotions buttons were not displaying images correctly
- Follow vue guidelines for multiword naming convention
- Favor tokens over magic px numbers
2020-01-15 17:37:54 +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
56a3822377
Merge pull request #2562 from Human-Connection/migrate-styleguide-buttons
refactor(styleguide): migrate and redesign buttons
2020-01-15 14:17:06 +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
Alina Beck
e9ad67d39b
Merge branch 'migrate-styleguide-buttons' into button-migration-fixes 2020-01-14 17:04:25 +03:00
roschaefer
966cdc9574 fix #2229
I have to agree with @vbelolapotkov here. First of all the translation
for German an English does not match and second it does not make an awful
lot of sense to have "Report these actions" twice in the list. The
English translation "Advocacy or encouragement to these behaviors."
probably belongs into the section before.
2020-01-12 17:35:31 +01:00
roschaefer
8c29ad947b Update vue-test-utils and follow updated docs
https://vue-test-utils.vuejs.org/guides/#writing-asynchronous-tests-using-nexttick-new
2020-01-11 00:37:22 +01:00
mattwr18
5d5574b1b5 Blocked users cannot comment on my posts 2020-01-09 16:07:25 +01:00
Alina Beck
93b6323c34 make cancel buttons red 2020-01-09 13:37:15 +05:30
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
2020-01-08 18:04:26 +01:00
mattwr18
cd7f0e2783 Fix/extend cypress tests 2020-01-08 17:08:06 +01:00
Alina Beck
be30b55f65 fix styling of terms-and-conditions button 2020-01-08 14:31:37 +05:30