Commit Graph

17 Commits

Author SHA1 Message Date
J. Ryan Stinnett 3829362754 Fix up merge to develop 2020-06-23 15:24:02 +01:00
RiotRobot 6161f95434 Merge branch 'master' into develop 2020-06-23 15:18:35 +01:00
David Baker a1592704a2 Unused code & import 2020-06-19 17:17:04 +01:00
David Baker 3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +01:00
David Baker e4d824839a Revert "Use recovery keys over passphrases" 2020-06-18 15:02:03 +01:00
David Baker e0a34d9dea Revert "Use recovery keys over passphrases" 2020-06-18 09:35:11 +01:00
David Baker 68e555a0c6 Support accounts with cross signing but no SSSS
At least at the login stage.

Fixes https://github.com/vector-im/riot-web/issues/13894
2020-06-05 16:40:20 +01:00
David Baker 0046e204a0 Make the continue button actually work 2020-06-02 18:30:37 +01:00
David Baker 5624cf5ceb Add option to reset keys to the encryption setup screen 2020-06-02 17:55:27 +01:00
David Baker e06ba2003b Prompt for recovery key on login rather than passphrase
Only show passphrase options at all if the user has a passphrase on
their SSSS key.
2020-06-02 16:32:15 +01:00
J. Ryan Stinnett 5af3d83cc7 Fix recovery link on login verification flow
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
2020-04-23 18:14:30 +01:00
Michael Telatynski 80b8120bc3 Update login security copy and design to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:32:02 +01:00
Michael Telatynski a9a2999ccc Use recovery passphrase and recovery key everywhere
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:26:12 +01:00
Bruno Windels db09cadb66 remove spinner, change copy, add button placeholder 2020-04-14 17:19:15 +02:00
Bruno Windels 78b167a7ea fix typo 2020-03-25 13:40:09 +01:00
Bruno Windels 792a7b3953 don't throw here 2020-03-25 13:07:07 +01:00
Bruno Windels 4ff847c8a3 put CompleteSecurity state management in store
and split off a child component (SetupCrossSigningBody) that can
be reused from the "Verify this session" toast.
2020-03-24 16:10:15 +01:00