8 Commits

Author	SHA1	Message	Date
Travis Ralston	fde32f13a5	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
Travis Ralston	042bd35d79	Fix MatrixClientPeg imports	2019-12-22 21:15:54 -07:00
Travis Ralston	d56f0f2a25	Convert many imports to handle ES6 exports ... Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761	2019-12-22 21:04:42 -07:00
David Baker	b98058fc3c	Add bug for removing temporary srceen	2019-12-19 19:54:44 +00:00
David Baker	822762f014	add todo	2019-12-19 19:49:36 +00:00
David Baker	48b166f451	Pass the key backup into the right thing	2019-12-19 17:28:32 +00:00
David Baker	6851ad04b6	Migrate key backups to SSSS ... If there's a key backup set up when we bootstrap SSSS, use its key for SSSS and add the key backup key as a passthrough secret. Requires https://github.com/matrix-org/matrix-js-sdk/pull/1128 Fixes https://github.com/vector-im/riot-web/issues/11210	2019-12-19 11:26:20 +00:00
J. Ryan Stinnett	9f1c2cd3e1	Add dialogs for creating and accessing secret storage ... This adds dialogs for creating and accessing secret storage via a passphrase or recovery key. These flows are adapted from the ones used for key backup.	2019-12-05 15:34:07 +00:00