1124 Commits

Author SHA1 Message Date
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
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
mattwr18
57a4309b30
Merge pull request #2544 from Human-Connection/2543-add-back-layout-changes
Add back layout changes/update db_manipulation
2019-12-18 16:16:00 +01:00
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
Alina Beck
c74bfde652 refactor to use only one value for the blurImage status 2019-12-18 15:26:45 +05:30
Alina Beck
edaac117eb remove code related to imageAspectRatio 2019-12-18 15:26:45 +05:30
ogerly
0213d64ba5 change const height = Math.min, remove 2000 2019-12-18 07:56:36 +01:00
mattwr18
3abfe13dcc Fix maintenance service/LocaleSwitch import 2019-12-17 16:15:11 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
mattwr18
c2bb406502
Merge pull request #2512 from Human-Connection/refactor_content_menu
Refactor: content menu
2019-12-16 16:13:45 +01:00
mattwr18
83ab648e93 Add back @roschaefer changes
- maintain reactive placeholders
2019-12-16 11:42:37 +01:00
Alexander Friedland
3a98767707
change link to FAQ
link FAQ Blur: https://support.human-connection.org/kb/faq.php?id=113
2019-12-16 11:12:30 +01:00
mattwr18
70c63297d4 Revert unrelated changes
- @roschaefer, I reverted the changes you made that were unrelated to
the server-side rendering issue with the editor... maybe we can put in a
separate PR with them, or a subset of them that doesn't remove the
reactivity of the editor placholder(?)
2019-12-16 11:06:47 +01:00
mattwr18
65b92786b7 Revert unrelated changes 2019-12-16 11:00:55 +01:00
roschaefer
71b2eac175 refactor: content menu
I hoped this would fix the bug with the editor sometimes not being shown
when clicking "Edit Post" but it does not.
2019-12-14 20:16:09 +01:00
roschaefer
a7a1e4affc fix: editor not visible in server-side-rendering
This is fixing a bug where sometimes the editor would not get displayed
until you click into the title text fields. This commit also removes
some obscure optimizations.

I'm really annoyed by the cruft that we still carry around until this
very day.

Every single line of untested code, which you left because you thought:
"Well sure this is going to improve performance!" is going to bite you.
2019-12-14 01:36:59 +01:00
Alexander Friedland
792ae8d598
change line 152
".ds-card-imag" TO ".ds-card-image"
2019-12-13 13:39:51 +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
ogerly
556adf2e37 final polish :) 2019-12-13 09:02:22 +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
ogerly
a30a7ac8b0 mounted removed and everything put on blurImage 2019-12-12 09:44:45 +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
0f3e4673ba clear css 2019-12-11 10:37:08 +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
roschaefer
5e53a155be Show the comments again
@alina-beck the CSS class `.ds-card-footer` gets in the way of the
`overflow: hidden` from the styleguide. The scoping avoids the issue.

Of course this is not a great solution and the whole file needs to be
refactored and fixed. I also see a lot of `<div>`s with a style
attribute. All of that is legacy code that survived for too long.
2019-12-10 18:53:40 +01:00
mattwr18
84edde273d
Merge pull request #2467 from Human-Connection/revert-layout-changes-imageAspectRatio
Revert layout changes image aspect ratio
2019-12-10 17:41:53 +01:00
mattwr18
4293fb845b
Merge pull request #2472 from Human-Connection/quickfix_for_nullpointer_error_in_user_vue
Quick fix for null pointer error in User.vue
2019-12-10 15:51:11 +01:00
mattwr18
da169d5d14 Revert changes to test 2019-12-10 15:40:03 +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
Robert Schäfer
1b787d7687
Merge pull request #2416 from Human-Connection/checkbox_no_comercial_add_to_creatUserAccount
Checkbox 'no comercial + no political account' add to creat user account
2019-12-10 15:21:40 +01:00
mattwr18
9703066699 Rename prop name following @roschaefer suggestion
- missed in previous PR
2019-12-10 14:37:05 +01:00
roschaefer
30870d832b Quick fix for null pointer error
`this.openMenu` is not a function`
2019-12-10 02:47:19 +01:00
mattwr18
60bf819a56 Remove counts to make less expensive db requests 2019-12-09 17:41:38 +01:00
mattwr18
79c6bd5c20 Paginate moderations page without losing filtering
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
2019-12-09 16:37:04 +01:00
ogerly
5ae6b3c954 fixed contributionForm.vue 2019-12-06 13:16:40 +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
roschaefer
fdca5b008b Return empty array instead null for "not reviewed"
@mattwr18 why did you add the null check in th resolver?
2019-12-06 02:47:14 +01:00
mattwr18
be319615f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-12-05 11:16:16 +01:00
mattwr18
8bd69e9e2f Fix import path 2019-12-04 20:11:34 +01:00
mattwr18
7becb09ef7 Add tests/Refactor
- Move tests which are not resource specific to own describe block, add
test cases
2019-12-04 19:41:58 +01:00
mattwr18
fe63e42262 Refactor component/story/test
- Remove data-test where not necessary
- Refactor tests to remove tests that belong in ReportRow
- Fix story
2019-12-04 19:40:32 +01:00