7 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	806d728d59	Import from the js-sdk's src/ directory ... Because ES6 and such.	2019-12-22 21:14:33 -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
J. Ryan Stinnett	3ac0deebab	Use static modals for verification ... Verification with cross-signing may requiring asking for your secret storage passphrase, which is displayed in it's own modal on top of flows. For now while verification takes in modals also, mark the verification ones as static so they don't lose state when secret storage appears on top mid-flow.	2019-12-13 13:55:28 +00:00
Bruno Windels	309633181d	use FormButton in verification request tile too and dedupe styles	2019-11-22 16:32:50 +01:00
Bruno Windels	0d2f9c4215	add verification request tile + styling	2019-11-07 19:54:56 +01:00