2667 Commits

Author SHA1 Message Date
Alina Beck
150d04080b follow @mattwr18 code review 2020-01-15 11:55:27 +03:00
Alina Beck
f53bcba13c use EmotionButton in filter menu 2020-01-15 11:42:12 +03:00
Alina Beck
90d1e50b9e refactor EmotionButton 2020-01-15 11:20:18 +03:00
ogerly
8edb551c15 ready to be merged or rebased 2020-01-15 07:40:01 +01: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
mattwr18
84e475fd8a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-13 21:22:58 +01:00
roschaefer
3781ba5d2e Fix LoginForm test and lints 2020-01-11 01:48:19 +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
1f06a862e7
Merge pull request #2262 from Human-Connection/1463-search-for-users
🍰 Search For Users
2020-01-10 13:59:44 +01:00
mattwr18
84780013f4 Fix cypress tests/start refactor search story
- Cannot use data-test in cypress tests as we use production image and
data-test are removed to minimize the image. Select based on styleguide
input's class

- Story is still not working because of filter dateTime and
$i18n.locale(), we can fix this later.

- Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2020-01-10 12:52:54 +01:00
mattwr18
b2db5e6057 Skip tests for DonationsInfo
- the functionality it's testing has been suspended. If we add back that
functionality, we should refactor the tests/stop skipping.
- Or maybe we can remove them in a separate PR??
2020-01-10 10:35:12 +01:00
Moriz Wahl
8c7079cf81 changes requested by reviews 2020-01-10 09:23:56 +01:00
mattwr18
5d5574b1b5 Blocked users cannot comment on my posts 2020-01-09 16:07:25 +01:00
Alina Beck
70d632e392 use scss tokens for counter icon and loading spinner 2020-01-09 14:47:14 +05:30
Alina Beck
b71638d29f use scss variables in base button component 2020-01-09 14:31:25 +05:30
Alina Beck
04e5ecc87d fix tests and lint errors 2020-01-09 13:48:30 +05:30
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
Alina Beck
1b9249c685 manage button states and color schemes with mixin 2020-01-09 13:13:33 +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
Alina Beck
53a504010c allow overflow for notifications counter 2020-01-08 14:28:21 +05:30
Alina Beck
cc38fa2b0a make content-menu clickable on post-card 2020-01-08 13:49:07 +05:30
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
2020-01-07 18:57:35 +01:00
Moriz Wahl
3f37b007d7 improved specs 2020-01-07 15:35:04 +01:00
Moriz Wahl
57ab9128ea removed Hashtag search 2020-01-07 09:16:34 +01:00
ogerly
223d1ca3c0 remove console 2020-01-07 06:02:19 +01:00
ogerly
9aa680ce50 Fix lint 2020-01-07 05:40:09 +01:00
ogerly
28839ee2b4 click on 'answered' to put the username of the respective comment into the editor as a mention. 2020-01-06 18:02:46 +01:00
Moriz Wahl
d2088a3a92 Missing SearchTag.vue added 2020-01-06 16:59:55 +01:00
Moriz Wahl
71c9d92aea query string for searches changed and basics for Hashtag search added 2020-01-06 16:46:43 +01:00
Moriz Wahl
bc3aa519d0 Specs for Searches 2020-01-06 16:10:28 +01:00
ogerly
af760c17ea Merge branch '1188-Delete_teaser_image' of https://github.com/Human-Connection/Human-Connection into 1188-Delete_teaser_image 2020-01-06 11:07:46 +01:00
ogerly
f8c0a34194 Proposed changes accepted and incorporated 2020-01-06 11:06:59 +01:00
Alexander Friedland
cd8b244741
Update webapp/components/ContributionForm/ContributionForm.vue
showDeleteButton change

Co-Authored-By: Robert Schäfer <git@roschaefer.de>
2020-01-06 10:57:48 +01:00
Mo Zargham
3234c2e861 added language tag for posts 2019-12-27 15:02:51 -05:00
ogerly
490fb7fdeb first example dynamisch usermention for answer comments 2019-12-21 22:11:38 +01:00
roschaefer
fb6e116446 isFirstOfType is not a computed property 2019-12-20 17:38:30 +01:00
mattwr18
a33cb1e6fc Make tests accurate 2019-12-20 01:14:43 +01:00
mattwr18
730da2029c Fix imageAspectRatio set to null UpdatePost
- we were not setting the form.imageAspectRatio to the value of the
post's imageAspectRatio, so when a user updated their post, but did not
update their imageAspectRatio it would set it to null
2019-12-20 00:59:29 +01:00
Alexander Friedland
d38a1f089f
Merge branch 'master' into 1188-Delete_teaser_image 2019-12-19 18:26:05 +01:00
ogerly
b9676271ea Delete teaser image 2019-12-19 17:46:25 +01:00
mattwr18
3ef04f8391 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users 2019-12-19 17:16:48 +01:00
mattwr18
46191e5889 Refactor isOfFirstType to computed/styling updates 2019-12-19 17:13:58 +01:00
mattwr18
b79c292ef4 Fix failing component tests
- Extract testing logic to SearchableInput spec
- write new tests for SearchResources
2019-12-19 17:13:14 +01: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
5c1242b999 reduce CounterIcon tests to only test logic 2019-12-19 13:07:07 +05:30
Alina Beck
56b1a74e64 let eslint do some magic 2019-12-19 12:53:38 +05:30
Alina Beck
ad27404059 fix failing component tests 2019-12-19 12:48:13 +05:30
Alina Beck
2941b1392e improve markup and design of Paginate component 2019-12-19 11:44:31 +05:30