2687 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	4335fa4f72	ktlint	2020-02-03 16:26:18 +01:00
Benoit Marty	6df5edbad1	Version++	2020-02-03 16:20:55 +01:00
Benoit Marty	362799ac08	Merge branch 'release/0.14.3' into develop	2020-02-03 16:15:52 +01:00
Benoit Marty	0049af7980	Prepare version 0.14.3	2020-02-03 16:15:38 +01:00
Valere	ce13e824b6	Merge remote-tracking branch 'origin/develop' into develop	2020-02-02 15:28:05 +01:00
Valere	b182a63ea1	fix concurrent co mofification	2020-02-02 15:28:00 +01:00
Benoit Marty	9ced2048d2	Version++	2020-02-02 14:26:09 +01:00
Benoit Marty	b158729b53	Prepare v0.14.2	2020-02-02 14:05:12 +01:00
Valere	367057cc29	Fix / cold start	2020-02-02 14:01:45 +01:00
Benoit Marty	5fb4f274f9	Version ++	2020-02-02 08:00:57 +01:00
Benoit Marty	6f60f1c6b4	Merge branch 'release/0.14.1' into develop	2020-02-02 07:56:00 +01:00
Benoit Marty	435d8cbc55	Prepare v0.14.1	2020-02-02 07:55:46 +01:00
Benoit Marty	bb0fafcb2f	Merge pull request #929 from vector-im/feature/xsigning_fix_4 ... Feature/xsigning fix 4	2020-02-02 03:13:54 +01:00
Benoit Marty	1d2928b3fb	ktlint	2020-02-02 03:13:15 +01:00
Benoit Marty	40b0f60964	Fix issue in dark theme. Also do not limit subtitles to 2 lines	2020-02-02 03:11:27 +01:00
Valere	96a556f449	Fix / Race causing key requests to be sent to early in xsigning	2020-02-02 01:21:08 +01:00
Valere	d436d3b8d4	Move rx logs to verbose	2020-02-02 00:41:36 +01:00
Valere	845f3f5ad1	FIx / use password textedit	2020-02-02 00:04:15 +01:00
Valere	fb838e5407	Fixes #813	2020-02-01 23:24:05 +01:00
Benoit Marty	40c70f64a8	Merge branch 'feature/to_device_done' into develop	2020-02-01 18:48:34 +01:00
Valere	245b3717b9	Send done in toDevice	2020-02-01 18:25:31 +01:00
Benoit Marty	9e15891053	Version++	2020-02-01 17:21:41 +01:00
Benoit Marty	649ebf4a34	Merge branch 'release/0.14.0' into develop	2020-02-01 17:20:04 +01:00
Benoit Marty	e9f220cca2	Prepare release 0.14.0	2020-02-01 17:19:53 +01:00
Benoit Marty	8a9bd97a88	Merge pull request #924 from vector-im/feature/crossing_fix_2 ... Feature/crossing fix 2	2020-02-01 17:17:30 +01:00
Valere	26400e6372	Prompt before resetting keys	2020-02-01 15:20:04 +01:00
Valere	282be29247	temp shield for read only	2020-02-01 15:20:04 +01:00
Benoit Marty	6ee7ee1460	Fix blink effect	2020-02-01 15:04:22 +01:00
Valere	2e0a84ccc9	display profile faster from known info	2020-02-01 15:03:00 +01:00
Valere	9d6e7d7bd0	Learn more shows my devices when keys not trusted	2020-02-01 14:36:17 +01:00
Valere	8f7b18239d	Warn on verify when private keys not known	2020-02-01 14:36:17 +01:00
Benoit Marty	10094a212c	ktlint	2020-02-01 14:02:51 +01:00
Benoit Marty	53e36dca9c	ZXing 3.3.3 because of https://github.com/zxing/zxing/issues/1170	2020-02-01 13:52:33 +01:00
Benoit Marty	6ec2dd8c00	Add startWith and logs	2020-02-01 12:12:40 +01:00
Benoit Marty	f098d6cf5b	Add startWith	2020-02-01 11:45:45 +01:00
Benoit Marty	cd606ba8a1	RoomMember decoration	2020-02-01 11:37:16 +01:00
Benoit Marty	59abee10f8	Convert to ConstraintLayout	2020-02-01 11:37:16 +01:00
Valere	64df9e23c2	Room Profile / Just show e2e status remove learn more	2020-02-01 11:03:00 +01:00
Valere	fc4f5faffd	Update Room decoration algo	2020-02-01 10:21:29 +01:00
Benoit Marty	256f8b77aa	Add Timber to rx module	2020-02-01 10:09:22 +01:00
Benoit Marty	f2f775cb99	Add TODOs	2020-02-01 01:17:18 +01:00
Benoit Marty	2616a889ef	Merge pull request #923 from vector-im/feature/xcrossing_fix ... Decoration in room profile and improve Rx flow	2020-01-31 20:48:20 +01:00
Benoit Marty	ccd4c1ed86	ktlint	2020-01-31 20:46:33 +01:00
Benoit Marty	bb92882958	(partially) Fix glitch	2020-01-31 20:28:57 +01:00
Benoit Marty	46dd17644f	Room decoration - in room profile UI	2020-01-31 20:12:02 +01:00
Benoit Marty	7e34b2a672	Room decoration - convert to ConstraintLayout	2020-01-31 20:02:01 +01:00
Benoit Marty	c3c88c387b	Improve Rx chain and cleanup	2020-01-31 19:55:22 +01:00
Valere	51e0f945a7	Quick Room Decoration	2020-01-31 18:52:33 +01:00
Benoit Marty	fd3619b100	Merge pull request #770 from vector-im/cross_signing ... Cross signing	2020-01-31 17:05:18 +01:00
Benoit Marty	e18b9d5155	Room decoration - UI in room list	2020-01-31 16:10:52 +01:00