1966 commits

Author	SHA1	Message	Date
Benoit Marty	634c8947bd	Merge branch 'develop' into refresh-summary	2020-04-15 17:29:08 +02:00
Benoit Marty	66f6b1ecac	Merge pull request #1224 from vector-im/feature/composer_shield ... Add shield in composer	2020-04-15 16:49:50 +02:00
Benoit Marty	affe2b59da	Fix crash	2020-04-15 16:40:01 +02:00
Valere	81012746c4	Code review / added new key for message hint	2020-04-15 15:39:23 +02:00
Valere	1deacfbb34	Code review	2020-04-15 15:37:43 +02:00
Valere	c35d854776	Add shield in composer	2020-04-15 15:37:43 +02:00
Benoit Marty	6d56220d98	Merge branch 'develop' into improvement-957-catchup-indicator-on-invite	2020-04-15 15:00:34 +02:00
Benoit Marty	c57fa3f0d0	Merge pull request #1176 from vector-im/feature/target-sdk-29 ... Increase targetSdk to 29	2020-04-15 14:32:16 +02:00
Benoit Marty	0c0e9521f5	Fix lint issue	2020-04-15 09:50:25 +02:00
Benoit Marty	e54077e020	String copied to Riot project	2020-04-14 17:26:23 +02:00
Benoit Marty	9111800e7a	Create specific string for RiotX	2020-04-14 17:23:59 +02:00
Benoit Marty	ef6847671a	Import strings from Riot	2020-04-14 17:13:43 +02:00
onurays	667b371653	Continue supporting old APIs.	2020-04-14 16:29:11 +03:00
onurays	190fbb95ec	Merge branch 'develop' into feature/target-sdk-29 ... # Conflicts: # vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt	2020-04-14 13:59:54 +03:00
Valere	ccacd20428	Merge branch 'develop' into feature/verification_unified_emoji	2020-04-10 16:05:33 +02:00
Valere	9cfb83f0d2	Remove outdated translation	2020-04-10 14:31:03 +02:00
Valere	943ba3bebd	Fix / string bad argument number - lint	2020-04-10 13:14:12 +02:00
Valere	fccfd00949	Fix / design update	2020-04-10 12:12:21 +02:00
Valere	5081361c2d	Update Scan confirm flow	2020-04-10 12:12:06 +02:00
Valere	f5dc0b38ff	Code review	2020-04-10 11:47:54 +02:00
Valere	8357abd455	Added prefix to resources to avoid accidental override	2020-04-10 11:18:41 +02:00
Valere	a703574004	Uniform emoji representation for all platform	2020-04-10 11:02:33 +02:00
Christopher Rossbach	ef2abbfbd4	Merge branch 'develop' into improvement-957-catchup-indicator-on-invite	2020-04-09 11:11:44 +02:00
Valere	7c0137e2dc	Fix / await callback suspend forever	2020-04-09 10:46:52 +02:00
Valere	34dec64d9c	Fixes #1214	2020-04-08 17:56:12 +02:00
Valere	6f2d7aebba	code review	2020-04-08 16:37:52 +02:00
Valere	366a35913b	Fix alignement	2020-04-08 16:31:01 +02:00
Valere	f04d8b0e03	cleaning	2020-04-08 16:31:01 +02:00
Valere	08af61b778	rename layout	2020-04-08 16:31:01 +02:00
Valere	277f35a352	Merge room creation events in one summary	2020-04-08 16:31:01 +02:00
Valere	68512e475f	WIP	2020-04-08 16:31:01 +02:00
Onuray Sahin	8a4a288074	Merge branch 'develop' into feature/target-sdk-29	2020-04-08 14:15:02 +03:00
onurays	5b1f887760	Code review fixes.	2020-04-08 14:10:31 +03:00
Christopher Rossbach	3ff5952417	Merge branch 'develop' into improvement-957-catchup-indicator-on-invite	2020-04-07 20:53:31 +02:00
Christopher Rossbach	222b72a014	Merge branch 'develop' into improvement-957-catchup-indicator-on-invite	2020-04-07 17:46:23 +02:00
Valere	8904ca27f2	clean	2020-04-07 15:30:19 +02:00
Valere	1a436f962f	update change log ... cleaning	2020-04-07 15:15:45 +02:00
Valere	5b4b5e7a57	Gossip keybackup key after verification!	2020-04-07 15:15:45 +02:00
Valere	153587bd82	Merge branch 'develop' into feature/crosssigning_bootstrap	2020-04-07 15:14:43 +02:00
Valere	326f2e99fb	klint	2020-04-06 10:00:59 +02:00
Valere	1dfd6f232a	Code quality / line too long	2020-04-03 18:59:21 +02:00
Valere	f605bb8270	Code review	2020-04-03 15:57:05 +02:00
Valere	7ffb6113a4	Increase file logger size	2020-04-03 13:53:34 +02:00
Valere	92bf3f1349	Update change log ... + code quality	2020-04-03 11:14:14 +02:00
Valere	6474735662	Fix / devtools was not showing all json numbers	2020-04-03 10:31:44 +02:00
Valere	45c5626267	Add generate key option	2020-04-02 18:30:43 +02:00
Valere	c27264761d	Back /Skip navigation	2020-04-02 18:11:52 +02:00
Valere	c6abfa14ea	Fix / Bind continue button	2020-04-02 16:54:30 +02:00
Valere	2f237cf17b	klint	2020-04-02 16:51:40 +02:00
Valere	bf5ba99653	Full bootstrap flow initial commit	2020-04-02 16:51:03 +02:00