4854 Commits

Author SHA1 Message Date
roschaefer
d3b256e99e Fix user mention menu on production data
Apparently some of our users in production have no slug, this will
assign an (hopefully unique) random slug to them.
2019-08-15 21:07:23 +02:00
Robert Schäfer
2cb8719d5f
Merge pull request #1269 from Human-Connection/dependabot/npm_and_yarn/webapp/human-connection/styleguide-0.5.18
Bump @human-connection/styleguide from 0.5.17 to 0.5.18 in /webapp
2019-08-15 20:35:20 +02:00
dependabot-preview[bot]
8305c69def
Bump @human-connection/styleguide from 0.5.17 to 0.5.18 in /webapp
Bumps @human-connection/styleguide from 0.5.17 to 0.5.18.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-15 15:43:57 +00:00
Robert Schäfer
544fd0d84c
Merge pull request #1265 from Human-Connection/dependabot/npm_and_yarn/backend/graphql-middleware-3.0.5
Bump graphql-middleware from 3.0.3 to 3.0.5 in /backend
2019-08-15 11:02:07 +02:00
dependabot-preview[bot]
31fa930ee2
Bump graphql-middleware from 3.0.3 to 3.0.5 in /backend
Bumps [graphql-middleware](https://github.com/prisma/graphql-middleware) from 3.0.3 to 3.0.5.
- [Release notes](https://github.com/prisma/graphql-middleware/releases)
- [Commits](https://github.com/prisma/graphql-middleware/compare/v3.0.3...v3.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-15 04:21:52 +00:00
Robert Schäfer
dac417f0a5
Merge pull request #1258 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-extensions-1.26.2
Bump tiptap-extensions from 1.26.1 to 1.26.2 in /webapp
2019-08-15 00:33:37 +02:00
Robert Schäfer
4249ba7334
Merge pull request #1260 from Human-Connection/dependabot/npm_and_yarn/webapp/vue-izitoast-ba6b03e
Bump vue-izitoast from `c246fd7` to `ba6b03e` in /webapp
2019-08-14 23:53:42 +02:00
Robert Schäfer
244a23a3dd
Merge pull request #1257 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.7.0
Bump neo4j-graphql-js from 2.6.3 to 2.7.0 in /backend
2019-08-14 23:52:51 +02:00
dependabot-preview[bot]
a163fe17e9
Bump tiptap-extensions from 1.26.1 to 1.26.2 in /webapp
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.26.1 to 1.26.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.26.1...tiptap-extensions@1.26.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-14 21:43:20 +00:00
Robert Schäfer
09e89b19e9
Merge pull request #1259 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.24.2
Bump tiptap from 1.24.1 to 1.24.2 in /webapp
2019-08-14 23:40:59 +02:00
Alexander Friedland
048c4a2502
Merge pull request #1224 from Human-Connection/A-1208-Registration-without-user-condition-confirmation
🍰 Registration confirmation of terms of use added II
2019-08-14 18:09:07 +02:00
Robert Schäfer
b6c96b7a57
Merge pull request #1261 from Human-Connection/1201-localise-categories
Localise categories
2019-08-14 17:44:21 +02:00
roschaefer
58a7e1ce2d Simplifycomponent, improve texts
@ogerly there is a difference between read and confirm: You can read but
don't have to confirm the terms and conditions. Therefore it's quite
important that the user also confirms the terms and conditions.
2019-08-14 16:38:35 +02:00
mattwr18
ab6cd501fe
Merge pull request #1209 from Human-Connection/1054-blocked-users
🍰 1054 blocked users
2019-08-14 16:36:41 +02:00
Matt Rider
a21cf5aef6 Fix cypress test 2019-08-14 15:19:27 +02:00
Matt Rider
f2dcd99ac5 Fix lint, remove console.log 2019-08-14 14:33:55 +02:00
ogerly
397b41377a delete console.log 2019-08-14 14:31:47 +02:00
Matt Rider
6099a986c9 Improve English, update case for English translations 2019-08-14 14:29:35 +02:00
ogerly
8307c4f48f Merge branch 'A-1208-Registration-without-user-condition-confirmation' of https://github.com/Human-Connection/Human-Connection into A-1208-Registration-without-user-condition-confirmation 2019-08-14 14:29:12 +02:00
ogerly
a5f448036c Suggestions implemented II 2019-08-14 14:27:44 +02:00
Robert Schäfer
34e3f7efd7
Delete package-lock.json
This file is generated by `npm` but we use `yarn`. It is not recommended to use multiple package managers.
2019-08-14 14:24:43 +02:00
ogerly
b3ab6e1b43 Suggestions implemented II 2019-08-14 14:12:55 +02:00
Matt Rider
ee93efd6d9 Localise categories 2019-08-14 13:57:39 +02:00
mattwr18
0213eec4e2
Merge pull request #1244 from Human-Connection/451-lokalise-unlocalised-texts-20190812
🍰 454 Lokalise / translate all unlocalised Texts / Translations / Languages
2019-08-14 12:01:56 +02:00
Wolfgang Huß
25981e0f35 Corrected Cypress test 2019-08-14 08:55:44 +02:00
Wolfgang Huß
ab7d158b26 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 451-lokalise-unlocalised-texts-20190812 2019-08-14 08:24:29 +02:00
Wolfgang Huß
bcb66b0cb3 Corrected English translations to @mattwr18 suggestions 2019-08-14 08:23:54 +02:00
dependabot-preview[bot]
801ef5316a
Bump vue-izitoast from c246fd7 to ba6b03e in /webapp
Bumps [vue-izitoast](https://github.com/roschaefer/vue-izitoast) from `c246fd7` to `ba6b03e`.
- [Release notes](https://github.com/roschaefer/vue-izitoast/releases)
- [Commits](c246fd78b1...ba6b03eb24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-14 04:28:55 +00:00
dependabot-preview[bot]
831c9b7c5f
Bump tiptap from 1.24.1 to 1.24.2 in /webapp
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.24.1 to 1.24.2.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.24.1...tiptap@1.24.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-14 04:27:34 +00:00
dependabot-preview[bot]
3eb24a85ea
Bump neo4j-graphql-js from 2.6.3 to 2.7.0 in /backend
Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.6.3 to 2.7.0.
- [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases)
- [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-14 04:25:32 +00:00
roschaefer
31299235a3 Better caching policy on the blocked users page
Read: https://medium.com/@galen.corey/understanding-apollo-fetch-policies-705b5ad71980
for the difference. I think it's exactly what we need to update the
blocked users as soon as we switch to the page.
2019-08-14 00:11:45 +02:00
roschaefer
6b884d84c1 Add translations 2019-08-13 19:56:01 +02:00
roschaefer
073185d424 All cucumbers implemented 2019-08-13 19:46:01 +02:00
roschaefer
b017203c64 Implement next cucumber scenario 2019-08-13 19:09:56 +02:00
roschaefer
fffd29e867 Sketch cucumber scenarios for blocked user feature
.. first scenario already passing
2019-08-13 18:20:32 +02:00
roschaefer
d2a6d8c047 Avoid notifications if user was blocked
Otherwise you would follow a link and get a 404
2019-08-13 17:16:24 +02:00
roschaefer
6fb926e735 Fix Search.feature in a hacky way
Ok, we have no control what parameters are passed to the cypher query
generated by `neo4j-graphql-js`. So I'm re-using the `filter` param.
If the `$filter` param is `{}` then we can use COALESCE to turn that
into empty array. Ugh.
2019-08-13 16:46:52 +02:00
roschaefer
717147bd0c Refetch posts list if you block a user
Because you won't see any posts of a blocked user
2019-08-13 16:06:10 +02:00
Robert Schäfer
f711a9c288
Merge pull request #1251 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/vue-5.1.11
Bump @storybook/vue from 5.1.10 to 5.1.11 in /webapp
2019-08-13 12:16:55 +02:00
Robert Schäfer
658c5aff52
Merge pull request #1250 from Human-Connection/dependabot/npm_and_yarn/webapp/storybook/addon-a11y-5.1.11
Bump @storybook/addon-a11y from 5.1.10 to 5.1.11 in /webapp
2019-08-13 12:16:19 +02:00
Robert Schäfer
1a09354bc5
Merge pull request #1255 from Human-Connection/consistent-naming-conventions
Maintain consistent naming/punctuation conventions
2019-08-13 12:16:00 +02:00
roschaefer
5103bdbc2a Fix tests 2019-08-13 11:50:33 +02:00
Matt Rider
3eee50d952 Maintain consistent naming/punctuation conventions 2019-08-13 11:24:55 +02:00
Robert Schäfer
bedbb21def Refactor notification spec
Wow this took me the entire day: If you run `createServer` multiple
times, more and more middlewares get added to the schema. That's why
the test would create 2^n notifications for n times you called
`createServer`. This is related to the following bug:

https://github.com/prisma/graphql-middleware/issues/63
2019-08-13 11:05:29 +02:00
Robert Schäfer
8de0195cf8 Keep existing filter params + same for text search 2019-08-13 11:05:29 +02:00
Robert Schäfer
5fb60d1132 Implement+test blocking a user on backend 2019-08-13 11:05:29 +02:00
Robert Schäfer
cc1f932803 Refactor tests with Post model 2019-08-13 11:05:29 +02:00
Robert Schäfer
bc4bffdc52 Add How-To for blocking a user 2019-08-13 11:05:29 +02:00
Robert Schäfer
3c610caca4 Fix styling and avatar url of blocked users 2019-08-13 11:05:29 +02:00
Robert Schäfer
7f509b3201 Implement block/unbock UI 2019-08-13 11:05:29 +02:00