8 commits

Author	SHA1	Message	Date
Ayush PS	c843387043	Merge branch 'develop' into Bubble-bericht	2021-05-07 18:32:38 +05:30
David Baker	6371a4abd1	Fix tests ... Remove stray file extensions in includes and update shared instance name.	2021-01-13 16:02:35 +00:00
David Baker	719faed2ff	Separate toasts for existing & new device verification ... Separate device verification toasts into ones for devices that were there when the app loaded and a separate toast for each device that has appeared since. Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506 (clicking a device from your own UserInfo now triggers the legacy verification flow again). Fixes https://github.com/vector-im/riot-web/issues/13422 Fixes https://github.com/vector-im/riot-web/issues/13418	2020-04-28 18:35:16 +01:00
J. Ryan Stinnett	520b4c3e65	Add tests for was verified case	2020-03-30 16:33:22 +01:00
J. Ryan Stinnett	b53b5cc45d	Add wasCrossSigningVerified in test	2020-03-30 15:24:43 +01:00
Zoe	098df07c67	review feedback	2020-03-30 10:18:47 +01:00
Zoe	4f3d4426ea	lint	2020-03-27 15:37:59 +00:00
Zoe	fda533ab48	test for shield behaviour	2020-03-27 15:25:44 +00:00