16 Commits

Author	SHA1	Message	Date
David Baker	49588da73d	Fix more tests	2019-10-29 19:39:31 +00:00
David Baker	3e2d845342	Merge remote-tracking branch 'origin/develop' into dbkr/cross_signing	2019-10-28 16:47:16 +00:00
David Baker	de1b545df1	lint	2019-10-28 15:42:42 +00:00
David Baker	8cad116dd7	Make tests pass ... * Pass the http backend out of makeTestClients so we can tell it to expect queries and flush requests out * Change colons to dots in the key events	2019-10-28 14:56:35 +00:00
Hubert Chathi	d8e8dddd25	initial implementation of verification in DMs	2019-10-08 15:44:51 -04:00
Travis Ralston	f80af68686	End the verification timer when verification is done ... Fixes https://github.com/matrix-org/matrix-js-sdk/issues/980 This also improves cleanliness in the tests to cancel/terminate timers when needed.	2019-07-10 14:51:12 -06:00
Hubert Chathi	6f6e7ea921	verify cross-signing key with SAS	2019-06-05 15:27:31 -04:00
Hubert Chathi	6a77df7b41	Merge branch 'develop' into dbkr/cross_signing	2019-06-05 12:48:17 -04:00
Hubert Chathi	4a9a1b40e9	initial implementation of secret storage and sharing	2019-06-04 15:04:45 -04:00
Janith Kasun	de8063a43a	Merge branch 'develop' into loglevel-extend	2019-05-19 09:40:38 +05:30
jkasun	a73dabcb67	Console logging to loglevel	2019-05-19 09:29:40 +05:30
J. Ryan Stinnett	761806c678	Add support for class properties ... This enables compiler and linting features to allow class properties like we do in the React SDK.	2019-05-13 13:52:37 +01:00
Hubert Chathi	01af303d63	fix the selection of the verification methods, and test more things	2019-04-04 14:08:30 -04:00
Hubert Chathi	d1e64d0cfb	support both the incorrect and correct MAC methods ... also do some refactoring to make it easier to support choices in the other methods in the future	2019-04-02 23:36:49 -04:00
Hubert Chathi	fb673b0304	change hex SAS verification to decimal and emoji	2019-02-08 00:56:30 -05:00
Hubert Chathi	244e1b84f7	Initial implementation of key verification	2019-01-23 13:34:25 -05:00