19 commits

Author	SHA1	Message	Date
Michael Telatynski	50b491d7e5	post merge fix	2020-01-27 15:48:19 +00:00
Michael Telatynski	b67256c7c2	post-merge fix	2020-01-24 16:41:43 +00:00
Michael Telatynski	342fcb09c4	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration ... Conflicts: src/components/views/right_panel/VerificationPanel.js src/components/views/toasts/VerificationRequestToast.js	2020-01-24 16:19:41 +00:00
Michael Telatynski	7a5e172b88	Apply a huge part of the decorations and copy	2020-01-24 16:16:46 +00:00
Travis Ralston	b7e680ba51	Fix key ID	2020-01-23 20:14:27 -07:00
Travis Ralston	b682e7d908	Generate a QR code for apps to scan	2020-01-23 20:05:32 -07:00
Travis Ralston	586a240e41	Don't use private keys for QR code	2020-01-23 19:29:54 -07:00
Travis Ralston	1ec746c014	Add verification with QR codes	2020-01-23 19:29:54 -07:00
Bruno Windels	a73b7229a7	fix lint	2020-01-17 16:31:38 +01:00
Bruno Windels	d20db3560a	fix import paths after build system refactor	2020-01-17 15:50:27 +01:00
Travis Ralston	d1fcef1211	Merge branch 'develop' into bwindels/verification-right-panel	2020-01-16 13:23:32 -07:00
Bruno Windels	7a88a94936	fixes!	2020-01-03 13:50:13 +01:00
Bruno Windels	de1c3e2f83	use same style as UserInfo for sections and paragraphs	2020-01-03 13:50:13 +01:00
Bruno Windels	2dd1e93d84	show message after clicking "they match"	2020-01-03 13:50:13 +01:00
Bruno Windels	b866c16071	show cancellation	2020-01-03 13:47:38 +01:00
Bruno Windels	db17321777	await verify so errors (like cancellation) are caught	2020-01-03 13:47:38 +01:00
Bruno Windels	2c28fa0568	use verif in right panel from "verify" button	2020-01-03 13:47:38 +01:00
Bruno Windels	0f415038be	actually start verify process in verification panel ... temporary code, as ux is not complete	2020-01-03 13:42:18 +01:00
Bruno Windels	c02fc44d25	WIP sas in right panel	2020-01-03 13:42:17 +01:00