80 commits

Author	SHA1	Message	Date
Nicolas Werner	392d7d5568	Try to fix windows build	2020-10-08 20:07:43 +02:00
Nicolas Werner	64d5a193f1	Fix in room verification	2020-10-06 17:02:41 +02:00
Nicolas Werner	bca29a4227	Make steps in verification flow explicit	2020-10-05 22:12:10 +02:00
Nicolas Werner	abff61bb6c	Fix nullopt when iterating reactions	2020-10-03 17:23:59 +02:00
Nicolas Werner	4802c34009	Merge remote-tracking branch 'origin/master' into cross-signing	2020-09-24 21:36:43 +02:00
Nicolas Werner	54db9c89ed	Simplify outbound session setup ... Don't send inbound session to self and claim and send all keys at once.	2020-09-20 23:07:02 +02:00
Nicolas Werner	4b36585e47	Fix typo in encryption error message	2020-09-19 15:45:23 +02:00
CH Chethan Reddy	8eb74daf76	Split qml part of Device Verification	2020-09-14 17:27:49 +05:30
Chethan2k1	898be090af	Add support non-encrypted room-verification messages	2020-09-10 11:08:39 +05:30
Chethan2k1	e8eeb480d5	Fix Wrong Emojis Issue in Room Verification	2020-09-04 12:02:24 +05:30
DeepBlueV7.X	657f4073e9	Merge branch 'master' into device-verification	2020-09-03 18:11:17 +00:00
Nicolas Werner	8d14a058c6	Fix endless pagination, when old history is inaccessible	2020-09-02 19:38:07 +02:00
CH Chethan Reddy	b174bd9380	Merge remote-tracking branch 'upstream/master' into device-verification	2020-08-30 22:27:14 +05:30
CH Chethan Reddy	0d1dd29b19	Small Fixes	2020-08-29 13:37:51 +05:30
CH Chethan Reddy	8a4bd37fea	[WIP] Room Verification Works!	2020-08-18 11:29:02 +05:30
Nicolas Werner	14a0aac748	Add /clear-timeline command	2020-08-09 23:36:47 +02:00
CH Chethan Reddy	2e20049b36	[WIP] Room-Verification Messages	2020-08-09 08:35:15 +05:30
Nicolas Werner	b972d827cb	Try to fix issue of pagination interfering with limited: true	2020-08-07 13:12:45 +02:00
Nicolas Werner	1f9215a5be	Split error messages from event decryption	2020-08-06 21:46:16 +02:00
Nicolas Werner	ade905c881	Fix shadowing variable	2020-07-26 13:07:36 +02:00
Nicolas Werner	a00b11def7	Rename EventStore::event to get to remove ambiguity with QObject::event	2020-07-26 12:33:30 +02:00
Nicolas Werner	4e7bd20e0c	Reset fetch in progress when fetch failed	2020-07-25 19:38:56 +02:00
Nicolas Werner	b294430fe5	Return to redacted messages instead of just storing the redaction	2020-07-25 19:38:27 +02:00
Nicolas Werner	19f27236ea	Fix reactions	2020-07-20 00:42:48 +02:00
Nicolas Werner	6f2bc908ba	Fix reaction display	2020-07-19 12:22:54 +02:00
Nicolas Werner	046b3f4da6	Mark own events as read again after sending	2020-07-18 20:39:31 +02:00
Nicolas Werner	56ea89aa11	Reenable sending messages	2020-07-18 17:43:49 +02:00
Nicolas Werner	9ae7d0dce3	Readd pagination and fix redactions	2020-07-13 00:08:58 +02:00
Nicolas Werner	3421728898	Fetch missing events	2020-07-10 01:37:55 +02:00
Nicolas Werner	530c531c4b	WIP: Event Store split out	2020-07-09 23:15:22 +02:00