5038 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	18c0f53764	Format	2020-08-03 17:33:24 +02:00
Benoit Marty	64d000ec53	Update PULL_REQUEST_TEMPLATE.md	2020-08-03 17:29:07 +02:00
Benoit Marty	8e84c099fa	Merge pull request #1747 from vulet/develop ... fix: invisible toolbar(status.im theme)	2020-08-03 16:59:30 +02:00
Benoit Marty	707b69e3e2	Merge branch 'develop' into develop	2020-08-03 16:58:52 +02:00
Valere	33f6e7e337	Version ++	2020-08-03 14:04:31 +02:00
Valere	9178fd2b5c	Merge branch 'hotfix/fix_crash_invite_user' into develop	2020-08-03 14:01:27 +02:00
Valere	69e499e497	Merge hotfix	2020-08-03 14:00:32 +02:00
Valere	1370ca7082	Merge branch 'hotfix/fix_crash_before_release' into develop	2020-08-03 12:23:55 +02:00
Valere	db6045778e	Update change log	2020-08-03 12:11:50 +02:00
Valere	2810923519	FIx / Crash when opening Invite User screen	2020-08-03 12:00:08 +02:00
ganfra	7f326abcd0	Merge pull request #1844 from vector-im/feature/pin_code ... Feature/pin code	2020-07-31 11:51:39 +02:00
ganfra	acf977577f	Pin: clean code	2020-07-31 11:47:51 +02:00
ganfra	995c552f2a	Merge branch 'develop' into feature/pin_code	2020-07-31 11:41:42 +02:00
ganfra	99ae1655f5	Pin: fix PopupAlertManager showing on top of PinCode	2020-07-31 11:34:24 +02:00
ganfra	7e45fe4509	Pin: add comment on UnlockActivity interface	2020-07-31 11:33:25 +02:00
Valere	531623178a	Version ++	2020-07-31 00:52:22 +02:00
Valere	7fddfa45e8	Merge branch 'release/1.0.3'	2020-07-31 00:02:02 +02:00
Valere	2b2fd3a356	Merge branch 'release/1.0.3' into develop	2020-07-31 00:02:02 +02:00
Valere	258acaf814	Prepare release 1.0.3	2020-07-31 00:01:33 +02:00
ganfra	a883d3ecdd	Merge branch 'develop' into feature/pin_code	2020-07-30 18:49:13 +02:00
Valere	2f6cdc6529	Merge pull request #1847 from vector-im/feature/crash_store_mvrx ... Fix IllegalArgumentException reported from store on HomeActivity aunch	2020-07-30 18:07:11 +02:00
Valere	1f226ca6c7	Merge pull request #1845 from vector-im/feature/admin_e2e_config ... Feature/admin e2e config	2020-07-30 18:06:27 +02:00
ganfra	9475cb3b39	Update CHANGES	2020-07-30 17:25:49 +02:00
ganfra	eb0d350097	Merge branch 'develop' into feature/pin_code	2020-07-30 17:24:48 +02:00
Valere	c90f5ed370	Fix IllegalArgumentException reported from store on HomeActivity aunch	2020-07-30 17:03:11 +02:00
Valere	ccb466edbe	Update change log	2020-07-30 16:57:25 +02:00
Valere	1204f6d9ce	UX feedback, reduce severity of message	2020-07-30 15:25:10 +02:00
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