5315 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bruno Windels	c8769514f3	adjust comment to reflect which keys we're talking about	2023-03-31 11:57:10 +02:00
Bruno Windels	a1b7696b91	fix lint	2023-03-30 17:08:23 +02:00
Bruno Windels	f6599708b9	implementing observing user trust so UI can update when signing	2023-03-30 17:01:51 +02:00
Bruno Windels	915ab9c683	Merge pull request #1067 from vector-im/cross-signing/sign-device-after-sas2 ... Cross-signing: sign device or user when mac check out during sas	2023-03-30 14:59:06 +02:00
Bruno Windels	ab65745b07	fix tests	2023-03-30 14:45:59 +02:00
Bruno Windels	c2b6c44a68	actually, don't need to pass this, it's already in options	2023-03-30 14:40:58 +02:00
Bruno Windels	74fe7427af	sign device or user when mac check out during sas	2023-03-30 14:39:39 +02:00
Bruno Windels	51c3e3104f	Merge pull request #1066 from vector-im/fix-sas-issues ... Fix some SAS issues	2023-03-30 12:52:47 +02:00
RMidhunSuresh	b8e282377e	Log mac method	2023-03-30 16:09:46 +05:30
RMidhunSuresh	244d56b60f	Fix broken tests	2023-03-30 16:09:30 +05:30
RMidhunSuresh	3f5e2af093	Abort SAS when disposing vm	2023-03-30 15:47:25 +05:30
Bruno Windels	e78580c4ef	Merge remote-tracking branch 'origin/device-verification-ui'	2023-03-30 11:59:39 +02:00
Bruno Windels	f158197685	Update src/matrix/verification/CrossSigning.ts	2023-03-30 09:37:54 +00:00
Bruno Windels	67cc426b85	Update src/matrix/verification/CrossSigning.ts	2023-03-30 09:37:46 +00:00
Bruno Windels	d8d4f2b61b	Merge pull request #1040 from vector-im/sas-verification ... Implement SAS Verification for crosssigning	2023-03-30 11:26:43 +02:00
RMidhunSuresh	ce018781f1	Make code more clear	2023-03-29 15:09:36 +05:30
RMidhunSuresh	7eb1c09a75	Use e2ee account	2023-03-29 15:09:36 +05:30
RMidhunSuresh	9884ee24eb	Fix render error	2023-03-29 15:09:36 +05:30
RMidhunSuresh	6a8007fe28	Use switch case	2023-03-29 15:09:36 +05:30
RMidhunSuresh	82692edab5	cancellation can be undefined	2023-03-29 15:09:36 +05:30
RMidhunSuresh	38a82b2cb2	Use getter	2023-03-29 15:09:36 +05:30
RMidhunSuresh	b2d6a78365	Remove property	2023-03-29 15:09:35 +05:30
RMidhunSuresh	6fefc1549e	Change method name	2023-03-29 15:09:35 +05:30
R Midhun Suresh	6e054fcb80	Update src/platform/web/ui/css/themes/element/theme.css ... Co-authored-by: Bruno Windels <274386+bwindels@users.noreply.github.com>	2023-03-29 15:09:35 +05:30
RMidhunSuresh	9080263bc6	Fix SAS failing	2023-03-29 15:09:35 +05:30
RMidhunSuresh	6e2cd3597f	Fix rebase again	2023-03-29 15:09:35 +05:30
RMidhunSuresh	53c0fc2934	Fix rebase	2023-03-29 15:09:35 +05:30
RMidhunSuresh	f822a7a344	Wrap in feature flag	2023-03-29 15:09:35 +05:30
RMidhunSuresh	e0b3e9f4c4	Use optional chaining	2023-03-29 15:09:35 +05:30
RMidhunSuresh	41ebf13156	Some more changes	2023-03-29 15:09:35 +05:30
RMidhunSuresh	5fa4afa021	Combine css styles	2023-03-29 15:09:35 +05:30
RMidhunSuresh	8becb2b605	Import as type	2023-03-29 15:09:35 +05:30
RMidhunSuresh	7e2823be5e	Import as types	2023-03-29 15:09:35 +05:30
RMidhunSuresh	ac1a16d548	Remove unused code	2023-03-29 15:09:35 +05:30
RMidhunSuresh	0588d04742	Pass in cancellation object	2023-03-29 15:09:35 +05:30
RMidhunSuresh	d32d0def36	Fix emit	2023-03-29 15:09:35 +05:30
RMidhunSuresh	918ee6bf1d	Change log string	2023-03-29 15:09:35 +05:30
RMidhunSuresh	e38040693b	Remove "any" type	2023-03-29 15:09:35 +05:30
RMidhunSuresh	cd3e32d4ac	Track view-model instance	2023-03-29 15:09:35 +05:30
RMidhunSuresh	8c06582e04	Fix rebase	2023-03-29 15:09:35 +05:30
RMidhunSuresh	15ab7e7a72	Create viewmodel inside start method	2023-03-29 15:09:35 +05:30
RMidhunSuresh	16c144868a	Refactor code	2023-03-29 15:09:35 +05:30
RMidhunSuresh	4aa86c6dd2	Support multiple requests	2023-03-29 15:09:34 +05:30
RMidhunSuresh	90ce3f5d86	Remove toast when receiving cancel	2023-03-29 15:08:57 +05:30
RMidhunSuresh	4c6a240e74	WIP: Toast notification	2023-03-29 15:08:54 +05:30
RMidhunSuresh	0f7ef6912f	WIP: Add views/view-models	2023-03-29 15:08:08 +05:30
Bruno Windels	8c6c957ff3	Merge pull request #1064 from vector-im/bwindels/console-logging-expand-errors ... ConsoleReporter: expand all parents of item that has an error	2023-03-29 00:31:24 +02:00
Bruno Windels	c92fd6069d	group imports and import types	2023-03-28 23:33:53 +02:00
Bruno Windels	6c294b1ab1	fix wrong import path that crept in merge again	2023-03-28 23:32:54 +02:00
Bruno Windels	e71ecdd0ba	Merge branch 'master' into sas-verification	2023-03-28 18:18:27 +02:00