5111 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ganfra	efa1263c35	Pin: set back the grace period to 2 minutes	2020-07-30 15:22:41 +02:00
ganfra	06bd353d44	Pin: polish a bit and clean code	2020-07-30 14:58:46 +02:00
Valere	562cfce9e2	Support HS admin option to disable E2EE for DMs ... Fixes #1794	2020-07-30 12:08:30 +02:00
ganfra	bb066b7c65	Add PinLocker to handle lock state	2020-07-29 20:19:01 +02:00
ganfra	37521d2d4f	Pin: add settings to enable/disable	2020-07-29 16:11:57 +02:00
Valere	b732ea6c69	Version ++	2020-07-29 11:39:23 +02:00
ganfra	5426e43cbb	Create PinCodeStore and migrate code to fragment	2020-07-29 11:38:04 +02:00
Valere	a048f79b37	Merge branch 'release/1.0.2'	2020-07-29 10:46:54 +02:00
Valere	3214f7d3d5	Merge branch 'release/1.0.2' into develop	2020-07-29 10:46:54 +02:00
Valere	06ef665f66	prepare release 1.0.2	2020-07-29 10:33:55 +02:00
Valere	e1a07f1da6	Merge pull request #1838 from vector-im/feature/session_store_migration ... Feature/session store migration	2020-07-29 10:31:14 +02:00
Valere	5c32c7388a	cleaning	2020-07-29 09:51:50 +02:00
Valere	c04f22d3bf	quick fix plural	2020-07-29 09:51:20 +02:00
Valere	cbf43ea7b3	Session store migration	2020-07-29 09:50:12 +02:00
Valere	9197275343	version++	2020-07-29 09:00:29 +02:00
ganfra	ecdef52829	Continue PIN code library integration (fork required)	2020-07-28 20:22:59 +02:00
Valere	cc4298209b	Merge branch 'release/1.0.1'	2020-07-28 18:03:37 +02:00
Valere	f26ce64914	Merge branch 'release/1.0.1' into develop	2020-07-28 18:03:36 +02:00
Valere	e3f5b7cab3	Prepare release 1.0.1	2020-07-28 18:02:51 +02:00
ganfra	cd38aa42aa	Merge branch 'develop' into feature/pin_code	2020-07-28 17:49:36 +02:00
Valere	dde9cdd8ac	Merge pull request #1821 from vector-im/feature/notification_off_alert ... Check if migration disabled notif	2020-07-28 17:04:15 +02:00
Valere	0d0308d584	Merge pull request #1802 from vector-im/feature/fix_reply_tag ... Feature/fix reply tag	2020-07-28 16:58:10 +02:00
Valere	a47ff99be7	Merge branch 'develop' into feature/fix_reply_tag	2020-07-28 16:58:00 +02:00
Valere	e619217687	Code quality	2020-07-28 16:56:55 +02:00
Valere	6f5b3371fe	Check if migration disabled notif	2020-07-28 16:56:55 +02:00
Valere	f7b9fc3bb1	Merge pull request #1826 from vector-im/feature/banned_list ... Added banned user screen	2020-07-28 16:53:58 +02:00
ganfra	700a2e9ce3	Merge pull request #1832 from vector-im/feature/fix_timeline_loading ... Fix timeline non loading when there are lots of filtered events	2020-07-28 16:30:57 +02:00
ganfra	5176a3e2aa	Merge branch 'develop' into feature/fix_timeline_loading	2020-07-28 16:30:34 +02:00
Valere	4631cd0e80	Merge pull request #1831 from vector-im/feature/quick_call_update ... Allow call in all 2 participants rooms	2020-07-28 16:24:22 +02:00
Valere	60c6512418	Fix / item flickering	2020-07-28 16:23:21 +02:00
Valere	12bc821ef3	code review	2020-07-28 16:23:21 +02:00
Valere	c82e910c38	Added banned user screen	2020-07-28 16:23:21 +02:00
ganfra	7ae0620b20	Update CHANGES	2020-07-28 15:09:45 +02:00
Valere	de32cdb703	Merge pull request #1828 from vector-im/feature/improve_edit_role_button ... Improve UI of edit role button	2020-07-28 14:46:54 +02:00
Valere	12e2a8ffc8	Allow call in all 2 participants rooms	2020-07-28 14:43:50 +02:00
ganfra	833f64fcec	Fix timeline non loading when there are lots of filtered events	2020-07-28 11:49:45 +02:00
Valere	73c051d2b1	Improve UI of edit role button	2020-07-28 11:35:37 +02:00
ganfra	da06695ab7	Relation content should be checked in encrypted content and not the decrypted one	2020-07-24 18:31:01 +02:00
Onuray Sahin	984ffc4fb9	Merge pull request #1797 from vector-im/feature/fix_rebranding_assets ... Fix rebranding assets on login screens	2020-07-24 15:16:02 +03:00
ganfra	a19a3f2a7f	Merge branch 'develop' into feature/pin_code	2020-07-24 11:35:38 +02:00
ganfra	d7b44ba0cf	Merge branch 'develop' into feature/fix_reply_tag	2020-07-24 11:32:59 +02:00
ganfra	e90fe5cf28	Update CHANGES	2020-07-24 11:31:47 +02:00
ganfra	20c7d80bb1	Clean code	2020-07-24 11:30:27 +02:00
ganfra	25f8a9418a	Merge pull request #1783 from vector-im/feature/sending_retry ... Feature/sending retry	2020-07-24 10:35:24 +02:00
onurays	21b609420b	ktlint fix.	2020-07-24 03:00:06 +03:00
ganfra	794b89c041	Reply: remove inner tags when replying	2020-07-23 18:23:49 +02:00
ganfra	407595e613	Change warning badge (white background)	2020-07-23 16:38:42 +02:00
ganfra	cac8099117	Local echo: use missing updateSendingInformation on RoomSummaryUpdater	2020-07-23 16:38:17 +02:00
onurays	4cc3e87d64	Fix rebranding assets on login screens.	2020-07-23 15:02:40 +03:00
ganfra	3e429490e7	Update CHANGES	2020-07-22 17:04:48 +02:00