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
Alina Beck
5d2af860db
wrap create-post link around button on user profile
2020-01-08 13:53:02 +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
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
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
ea612bdf78
replace another batch of ds-buttons with base-buttons (wip)
2019-12-19 12:19:58 +05:30
Alina Beck
f6cdf9ff64
removes LoadMore button
2019-12-19 08:39:27 +05:30
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
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content
2019-12-17 07:39:26 +01:00
mattwr18
2d8fef1edc
Merge pull request #2487 from Human-Connection/fix_cannot_read_post_of_undefined_once_and_for_all
...
Fix broken scroll behaviour on index and profile page
2019-12-13 13:24:19 +01:00
mattwr18
dfd30cbaac
Remove check for setting name to null or undefined
...
- this was making things more likely to fail from the frontend, we would
need to consider doing a db manipulation for users from the old alpha
who have user.name as null.
- it only protects against someone who bypasses our UI and sends a
message directly to the backend, but if they can do that we have bigger
problems.
2019-12-13 10:17:19 +01:00
mattwr18
fd1e2c91fd
Refactor to consolidate UpdateUser mutations
2019-12-12 18:48:56 +01:00
mattwr18
d375ebe7d9
Write test/refactor tests/resolvers/middleware
...
- write tests for userMiddleware
- checks the functionality of nodes/locations middleware
- refactor to not allow users to update to remove their name
debatable whether we want that or not, but we do not allow users to
create accounts with no name, so we should be consistent, before we were
using neode to validate this, but we have are removing neode from
production code, so we must validate ourselves
- collate UpdateUser mutations to one
2019-12-12 18:14:47 +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
roschaefer
e24d8035b1
Fix this annoying bug with a tested helper
...
I don't know where the bug originates. But it can only be that either
`previousResult` or `fetchMore` result is sometimes undefined. This
should make the function bullet-proof for these situations.
2019-12-10 23:28:01 +01:00
Robert Schäfer
032242ac7c
Merge pull request #2481 from Human-Connection/fix_cannot_read_post_of_undefined
...
Fix `Cannot read 'Post' of undefined`
2019-12-10 19:04:12 +01:00
roschaefer
1a852ebfab
Fix Cannot read 'Post' of undefined
2019-12-10 17:53:54 +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
mattwr18
a8edf46b56
Merge pull request #2422 from Human-Connection/2401-Hide_Donations_Bar
...
Hide Donations Bar
2019-12-06 11:25:55 +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
mattwr18
9fd4ad47dd
Merge pull request #2317 from Human-Connection/2253-fix-scroll-layout-issue
...
2253 fix scroll layout issue
2019-12-05 21:02:10 +01:00
