5716 Commits

Author SHA1 Message Date
Robert Schäfer
7bc8646954
Merge pull request #2494 from Human-Connection/erhardtstiefel-patch-11
Update fr.json
2019-12-13 01:05:56 +01:00
Robert Schäfer
7efaa051b4
Merge pull request #2496 from Human-Connection/erhardtstiefel-patch-12
Update it.json
2019-12-13 01:04:45 +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
Moriz Wahl
c8634f1a10 Adding some space after the Heading for Posts 2019-12-12 11:34:00 +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
dependabot-preview[bot]
d9ca812750
build(deps): bump @nuxtjs/apollo in /webapp
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc18 to 4.0.0-rc19.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.18...v4.0.0-rc.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-12 04:19:21 +00:00
Alina Beck
5586335ed2 refactor css, fix design issues 2019-12-11 18:54:49 +03:00
Alina Beck
dd89c2655b add button states 2019-12-11 17:06:06 +03:00
Erhardt Stiefel
65a51ea471
Update it.json
These two lines added to give the user the chance to delete his posts and/or his comments when deleting his account, too
            "contributionsCount": "Cancellare i miei {count} messaggi",
            "commentedCount": "Cancella i miei {count} commenti",
2019-12-11 13:30:06 +01:00
Erhardt Stiefel
eceae24683
Update fr.json 2019-12-11 13:10:17 +01:00
Erhardt Stiefel
d6442b123e
Update es.json
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Borrar datos", to "name": "Eliminar cuenta de usuario", to solve the bug
2019-12-11 12:56:38 +01:00
Erhardt Stiefel
aed15f0be9
Update de.json
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Daten löschen", to "name": "Benutzerkonto löschen", to solve the bug
2019-12-11 12:28:41 +01:00
Erhardt Stiefel
61862905be
Update en.json
After a longer discussion I understood just to change the title of the function deleteUserAccount by renaming "name": "Delete data", to "name": "Delete user account", to solve 🐛 [Bug] Misleading description on "Delete your account" #2355
2019-12-11 11:19:07 +01: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
dependabot-preview[bot]
232787d412
build(deps): bump node from 13.1.0-alpine to 13.3.0-alpine in /webapp
Bumps node from 13.1.0-alpine to 13.3.0-alpine.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 09:14:16 +00:00
ogerly
e737a3cd82 review alina add 2019-12-11 08:25:32 +01:00
dependabot-preview[bot]
50a20141cf
build(deps): bump cookie-universal-nuxt from 2.0.19 to 2.1.0 in /webapp
Bumps [cookie-universal-nuxt](https://github.com/microcipcip/cookie-universal) from 2.0.19 to 2.1.0.
- [Release notes](https://github.com/microcipcip/cookie-universal/releases)
- [Commits](https://github.com/microcipcip/cookie-universal/compare/v2.0.19...v2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 04:22:47 +00: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
lokalise-bot
f672abfaa9 Lokalise: update of webapp/locales/ru.json 2019-12-10 21:55:16 +01:00
lokalise-bot
08dbfb31c9 Lokalise: update of webapp/locales/es.json 2019-12-10 21:55:15 +01:00
mattwr18
a348c5dc9c
Merge pull request #2482 from Human-Connection/fix_no_comments_visible
Show the comments again
2019-12-10 19:59:04 +01:00
mattwr18
950f33f637
Merge pull request #2470 from Human-Connection/improve_notification_query_performance
Improve notification query performance by reducing db calls
2019-12-10 19:26:05 +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
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
roschaefer
deefc4e12f Improve notification query performance
Just don't ask for stuff that you don't want to show anyways
2019-12-10 18:09:32 +01:00
roschaefer
1a852ebfab Fix Cannot read 'Post' of undefined 2019-12-10 17:53:54 +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
bc6b1c1a8c
Merge pull request #2421 from Human-Connection/remove-data-test-attributes-in-production
Remove data-test attriubutes in non-dev env
2019-12-10 14:44:34 +01:00
mattwr18
9703066699 Rename prop name following @roschaefer suggestion
- missed in previous PR
2019-12-10 14:37:05 +01:00
mattwr18
a9cfd25c2a
Merge pull request #2475 from Human-Connection/dependabot/npm_and_yarn/webapp/css-loader-3.3.0
build(deps-dev): bump css-loader from 3.2.1 to 3.3.0 in /webapp
2019-12-10 14:29:21 +01:00
mattwr18
06163e85fe
Merge pull request #2477 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-import-2.19.1
build(deps-dev): bump eslint-plugin-import from 2.18.2 to 2.19.1 in /webapp
2019-12-10 14:29:04 +01:00
mattwr18
ce659b8c56 Merge branch 'master' of github.com:Human-Connection/Human-Connection into quickfix_for_nullpointer_error_in_user_vue 2019-12-10 14:28:10 +01:00
Alina Beck
2c2f69fbf8 add BaseButton component 2019-12-10 16:25:14 +03:00
mattwr18
bcf602fe77 Use more verbose naming
- Co-authored-by: Alina Beck <alina.beck@mail.com>
2019-12-10 14:08:13 +01:00
mattwr18
27a2ccd9ae Merge branch 'master' of github.com:Human-Connection/Human-Connection into remove-data-test-attributes-in-production 2019-12-10 13:31:10 +01:00
Moriz Wahl
bdbabc2d12 Cleaning up backend, bugfix in frontend 2019-12-10 12:34:12 +01:00
Alina Beck
8f70ce5b31 set up css resets 2019-12-10 13:17:04 +03:00
mattwr18
65cf8e4792
Merge pull request #2443 from Human-Connection/2237-longer-comments
Fix #2237, Comments 4 times as long before "show more"
2019-12-10 11:07:24 +01:00
mattwr18
4af63ee0aa
Merge pull request #2404 from Human-Connection/get_rid_of_inconsistency_with_setup_neode
Get rid of inconsistency with neode setup
2019-12-10 11:04:35 +01:00
Moriz Wahl
72e4d0abbc Basic Search Is Working For Users And Posts
The story of SearchInput.vue throws errors because of line 81, dateTime. What must be included to fix this?
The search results shown by the frontend are sometimes differnt from the response of the backend. It shows no results found though there are results incoming.
Tests are not implemented yet.
2019-12-10 10:36:08 +01:00
Moriz Wahl
81842592df Simple Implementation In Stroybook Of SearchInput
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
2019-12-10 10:36:08 +01:00
Moriz Wahl
3e6124fd92 Add Basic Story For SearchInput
I had to remove `| dateTime('dd.MM.yyyy')` in line 61 of the vue file due to issues with $i18n which surely can be easyly solved.
The idea is, that `results` is an object which contains the keys `posts` and `users`. The values are arrays with the search results.
2019-12-10 10:35:25 +01:00