4208 Commits

Author SHA1 Message Date
Robert Schäfer
9ec9034ea5 Fix translatios as suggested by @Tirokk 2019-06-20 15:25:59 +02:00
Robert Schäfer
ff46740e90 Follow @mattwr18 suggetions don't enter mail twice 2019-06-20 15:13:22 +02:00
Wolfgang Huß
c5f2d7cc78 Solve remaind merge conflict 2019-06-20 11:26:51 +02:00
Wolfgang Huß
42942e4777 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text
# Conflicts:
#	webapp/components/Editor/index.vue
2019-06-20 10:37:10 +02:00
Wolfgang Huß
ffbe0b949a Translate menu item, renamed variables and tried to get hashtag to work correct 2019-06-20 08:40:05 +02:00
dependabot-preview[bot]
37b913620f
Bump graphql-shield from 5.3.8 to 5.6.1 in /backend
Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 5.3.8 to 5.6.1.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v5.3.8...v5.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-20 04:35:38 +00:00
dependabot-preview[bot]
c1ca7c6e58
Bump graphql-yoga from 1.17.4 to 1.18.0 in /backend
Bumps [graphql-yoga](https://github.com/prisma/graphql-yoga) from 1.17.4 to 1.18.0.
- [Release notes](https://github.com/prisma/graphql-yoga/releases)
- [Commits](https://github.com/prisma/graphql-yoga/compare/v1.17.4...v1.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-20 04:34:36 +00:00
Robert Schäfer
9dd340c69b Template emails based on postmark-templates
Credit: https://github.com/wildbit/postmark-templates/

Also we distinguish now if a user has been found and if not. The
password reset link brings us directly to the last step in the flow.
2019-06-20 01:29:50 +02:00
Robert Schäfer
61ad100bfb Get rid of unnecessary .env var - document it 2019-06-20 00:09:26 +02:00
senderfm
d85f49fb15 Fix: long comments can be folded up and down 2019-06-19 17:45:52 +02:00
Robert Schäfer
3f5e9a21cc Disable SEND_MAILS for local development and test
.. but enable it by default for `docker-compose.override.yml`. If the developer
uses `docker-compose` we can safely assume that a local smtp server for
development is running.
2019-06-19 15:03:38 +02:00
0c3e53a239
Merge pull request #836 from Human-Connection/835-use-vuex-to-make-editor-placeholder-reactive
Set up editor placeholder to use Vuex
2019-06-19 14:59:17 +02:00
40010826ba
Merge pull request #851 from Human-Connection/dependabot/npm_and_yarn/backend/babel-eslint-10.0.2
Bump babel-eslint from 10.0.1 to 10.0.2 in /backend
2019-06-19 14:57:46 +02:00
8debbd03eb
Merge pull request #854 from Human-Connection/dependabot/npm_and_yarn/webapp/babel-eslint-10.0.2
Bump babel-eslint from 10.0.1 to 10.0.2 in /webapp
2019-06-19 14:57:06 +02:00
c91932a028
Merge pull request #861 from Human-Connection/dependabot/npm_and_yarn/webapp/apollo-client-2.6.3
Bump apollo-client from 2.6.2 to 2.6.3 in /webapp
2019-06-19 14:56:34 +02:00
288b0606bd
Merge pull request #862 from Human-Connection/dependabot/npm_and_yarn/backend/apollo-client-2.6.3
Bump apollo-client from 2.6.2 to 2.6.3 in /backend
2019-06-19 14:55:08 +02:00
Robert Schäfer
c85c94aa40 Splitting components, better route navigation
This also allows us to generate a password reset link to quickly reset
your password without entering the code and email manually.
2019-06-19 14:23:22 +02:00
9cbb736d70
cleanup import todo 2019-06-19 13:54:20 +02:00
Robert Schäfer
a7eced5f8e Redirect to `/' if user is authenticated 2019-06-19 13:40:08 +02:00
7613ddfc04
lint fixes 2019-06-19 13:36:14 +02:00
aa54433afb
improved accuracy of import to reflect different types of contributions & follows. Cleaned neo4j import folder structure 2019-06-19 13:35:21 +02:00
Robert Schäfer
217c905800 Merge remote-tracking branch 'origin/master' into 801_reset_password 2019-06-19 13:26:13 +02:00
65471efb0d
removed fixImageUrls reference 2019-06-19 13:08:51 +02:00
Wolfgang Huß
4725b8cbd2 Got Tags as # in the editor as an extension to work 2019-06-19 09:12:26 +02:00
Wolfgang Huß
49568259b0 Merge remote-tracking branch 'origin/master' into 779-tags-of-contribution-in-text 2019-06-19 07:42:38 +02:00
dependabot-preview[bot]
2e66c671c2
Bump apollo-client from 2.6.2 to 2.6.3 in /backend
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.2...apollo-client@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-19 04:20:14 +00:00
dependabot-preview[bot]
a6a0ee16a0
Bump apollo-client from 2.6.2 to 2.6.3 in /webapp
Bumps [apollo-client](https://github.com/apollographql/apollo-client) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/apollographql/apollo-client/releases)
- [Changelog](https://github.com/apollographql/apollo-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-client/compare/apollo-client@2.6.2...apollo-client@2.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-19 04:19:09 +00:00
Robert Schäfer
304fd028f0 Leftover token=>code 2019-06-18 23:51:54 +02:00
Robert Schäfer
38327ddf71 Split password flow into different routes part 1 2019-06-18 23:49:38 +02:00
Robert Schäfer
d8eca07c21 Fix lint 2019-06-18 23:28:48 +02:00
Robert Schäfer
29b910cfb7 Really basic passwordReset flow works 2019-06-18 23:28:06 +02:00
Robert Schäfer
cc26d0be94 Handle passwordReset response on reset page 2019-06-18 22:48:53 +02:00
Robert Schäfer
506fe0fe94 Add support instructions 2019-06-18 22:35:52 +02:00
Robert Schäfer
7446464d6c Better translations 2019-06-18 19:08:59 +02:00
Robert Schäfer
ba185bcb65 Refactor backend 2019-06-18 19:03:59 +02:00
8984df9371
lint fixes 2019-06-18 17:43:00 +02:00
Robert Schäfer
69434cdc7f Nicer information messages 2019-06-18 16:11:05 +02:00
Alexander Friedland
5a80c6df6f
Merge pull request #855 from Human-Connection/436-Menu-in-Post-Scroll-to-Comment-section
When you call up a post you can scroll to the comments
2019-06-18 15:20:39 +02:00
Alexander Friedland
fbad4ce6ce
Merge pull request #856 from Human-Connection/849-Text-description-for-Filter-Bubble
Fix a text description for the filter bubble
2019-06-18 15:12:19 +02:00
Alexander Friedland
524dec1095
Merge pull request #786 from Human-Connection/764-Untranslated-Texts-in-Post-Page
[Bug] Untranslated Texts in Post Page #764
2019-06-18 15:07:42 +02:00
Robert Schäfer
3948cb8ace VerifyCode.spec passes 2019-06-18 13:51:30 +02:00
Robert Schäfer
559210d204 Oh, forgot, you have to add the email again
Well, this is not good practice. If an attacker has access to the
mailbox then she knows also the email account as well. It's better to
ask the user for the unique username, e.g. `@username`.

https://stackoverflow.com/a/16018373
2019-06-18 13:25:25 +02:00
Robert Schäfer
288e5002fd Flesh out VerifyCode.spec.js 2019-06-18 13:13:13 +02:00
Robert Schäfer
a641ab6884 Turn off autocomplete for all password fields 2019-06-18 13:01:19 +02:00
Robert Schäfer
5a781b0bc6 Copy+Paste code form Password/Change, DRY later 2019-06-18 12:58:43 +02:00
Robert Schäfer
de40499007 Move to next step after verify code 2019-06-18 12:41:58 +02:00
Robert Schäfer
8fc74b9e14 Put validation error translations together 2019-06-18 12:09:06 +02:00
senderfm
8484704460 Fix a text description for the filter bubble 2019-06-18 10:49:20 +02:00
senderfm
0a66ad56d9 Fix Specs, lint, fix test 2019-06-18 09:58:29 +02:00
dependabot-preview[bot]
ef5a20b3df
Bump babel-eslint from 10.0.1 to 10.0.2 in /webapp
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.2.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-18 05:06:24 +00:00