1101 Commits

Author SHA1 Message Date
ogerly
556adf2e37 final polish :) 2019-12-13 09:02:22 +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
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
mattwr18
a59e72d8a8 Add stories/specs for ReportList 2019-12-04 19:40:08 +01:00
mattwr18
d0a18fded8 Rename component, add story/specs 2019-12-04 19:39:36 +01:00
mattwr18
235702867d Move components to components/features
- we are reserving _new directory for components that have no dependency
on the Nitro-Styleguide
- update pat
2019-12-04 19:38:48 +01:00
mattwr18
26b4d4ab93 Add clock icon inside if clause 2019-12-04 19:37:21 +01:00
ogerly
b532a38966 lint fix 2019-12-04 15:23:16 +01:00
ogerly
7b0b2cc93e rename checkedBlur to blurImage, testing checkbox 2019-12-04 15:14:57 +01:00
Alina Beck
b1955e64f4 improve tests, following @roschaefer suggestions 2019-12-04 16:57:42 +03:00
mattwr18
085b59bf4d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-12-04 13:23:06 +01:00
ogerly
6ce797e8ef test review 2019-12-04 11:20:27 +01:00
Alina Beck
68aabedc6d move css classes to the correct component files 2019-12-04 12:25:44 +03:00
roschaefer
d143d629ed Use data-test attributes, make test more resilient
as suggested by @mattwr18
2019-12-04 01:17:14 +01:00
roschaefer
84f574aaa0 Fix frontend tests 2019-12-04 00:22:28 +01:00
ogerly
a5bbb06f77 fix Spec + lint 2019-12-03 18:27:05 +01:00
ogerly
38c58af1f3 add confirm checkboc No Comercial account 2019-12-03 17:57:30 +01:00
Alina Beck
750a1e523f extract ReportRow into separate component 2019-12-03 18:42:48 +03:00
mattwr18
66f1aa8888 Follow @roschaefer PR review suggestions
- Update seed file with more human readable imageAspectRatios
- Remove copy script from Dockerfile to not expose to others. we'll need
to either start a maintenance server, so it has access to both the
backend/public/uploads and cypher-shell, or copy a script to the backend
that creates a csv, which can be copied to the neo4j pod and then loaded
into the cypher.
- Remove unintended changes to deployment/legacy-migration
- Add back image compression to Post images
2019-12-03 15:33:54 +01:00
Alina Beck
3de205d7c2 style nested table 2019-12-03 14:03:31 +03:00
Alina Beck
d685ff9e7b translate and style user count 2019-12-03 13:25:20 +03:00
Alina Beck
9801369343 merge table rows 2019-12-03 13:07:24 +03:00
Alina Beck
4585dc7e8c table cell content design tweaks 2019-12-03 12:45:28 +03:00
Alina Beck
febabf9303 rename table header translations 2019-12-03 12:25:19 +03:00
Alina Beck
21a3ff4bc8 render just one thead and tbody for the reports table 2019-12-03 12:03:41 +03:00
Alina Beck
150ffef35a style report list header 2019-12-03 11:37:58 +03:00