3548 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Valere	39e18446ae	fix typo	2020-04-29 09:34:28 +02:00
Valere	947c46d7b5	Avoid negative margin	2020-04-28 19:16:29 +02:00
Valere	8871390167	Code review	2020-04-28 12:25:50 +02:00
Valere	bdce71abfd	Update change log	2020-04-24 16:50:56 +02:00
Valere	114bce5f64	Fix / DB crash due to deserializaion	2020-04-24 16:50:56 +02:00
Valere	20e5ebc88b	Decorate timeline with e2e warning	2020-04-24 16:50:56 +02:00
Benoit Marty	57779c99c2	improve script	2020-04-24 14:39:55 +02:00
Benoit Marty	02e02ed691	Merge pull request #1275 from vector-im/feature/log_improvement ... Log improvement for test	2020-04-24 14:38:28 +02:00
Benoit Marty	af0b798ef1	Ensure Timber log output when running tests ... to squash	2020-04-24 13:38:28 +02:00
Benoit Marty	51be8d5ed5	Remove previous temporary solution	2020-04-24 13:26:25 +02:00
Benoit Marty	270bed5013	EventBus logs using Timber	2020-04-24 11:57:49 +02:00
Benoit Marty	20b3c33fb0	Remove bad comment	2020-04-24 11:57:49 +02:00
Benoit Marty	b2aaf1cca1	CurlLoggingInterceptor now uses Timber to log	2020-04-24 11:57:49 +02:00
Onuray Sahin	5f6969e2cc	Merge pull request #1270 from vector-im/feature/misleading_url_target ... Show a warning dialog if the text of the clicked link does not match	2020-04-24 11:53:16 +03:00
Onuray Sahin	f0648ee52a	Merge branch 'develop' into feature/misleading_url_target	2020-04-24 11:24:39 +03:00
Valere	88c70a2c10	Merge pull request #1266 from vector-im/feature/update_ssss_activity ... Feature/update ssss activity	2020-04-23 21:20:43 +02:00
Valere	22c3ed6bb9	Code review	2020-04-23 21:20:01 +02:00
Valere	b0d25fa84f	Update vector/src/main/res/values/strings_riotX.xml ... Co-Authored-By: Benoit Marty <benoitm@matrix.org>	2020-04-23 21:16:46 +02:00
Valere	57636207d2	Fix copy	2020-04-23 21:16:46 +02:00
Valere	eac9133bb1	update change log	2020-04-23 21:16:46 +02:00
Valere	f7e7659750	klint	2020-04-23 21:16:28 +02:00
Valere	e719541b5e	Fix / crash when generating random key	2020-04-23 21:16:28 +02:00
Valere	bd7acfbb1a	Add option to recover with recovery key	2020-04-23 21:16:28 +02:00
Valere	25b42cb4f3	Merge pull request #1272 from vector-im/feature/update_design_complete_secu ... Update design wait for self verification	2020-04-23 21:14:02 +02:00
Valere	928149fe35	Merge branch 'develop' into feature/update_design_complete_secu	2020-04-23 21:13:53 +02:00
Onuray Sahin	a80181da9e	Merge branch 'develop' into feature/misleading_url_target	2020-04-23 20:18:44 +03:00
onurays	72de5d6adc	Code review fixes.	2020-04-23 20:17:52 +03:00
Benoit Marty	ed4154d763	Merge pull request #1261 from vector-im/feature/unwedging ... Feature/unwedging	2020-04-23 18:20:31 +02:00
Benoit Marty	4ee13b6fa1	Merge branch 'develop' into feature/unwedging	2020-04-23 18:20:09 +02:00
Benoit Marty	33fb1dd147	Merge pull request #1262 from vector-im/feature/fix_add_by_user_id ... Add user to direct chat by user id.	2020-04-23 18:05:15 +02:00
Valere	736905edf8	Merge pull request #1269 from vector-im/feature/complete_security_hide_4s ... Hide Use recovery key when 4S is not setup	2020-04-23 18:03:14 +02:00
Benoit Marty	e8a91eab88	Merge pull request #1265 from vector-im/feature/deactivate ... Deactivate account using password	2020-04-23 17:30:08 +02:00
Valere	b951af0116	RiotX spelling	2020-04-23 17:00:37 +02:00
onurays	c3299845c1	use generic cancel and continue strings.	2020-04-23 17:44:30 +03:00
onurays	54644db587	Dialog design fixes.	2020-04-23 17:37:30 +03:00
Valere	cb0e93c43e	use theme notice color	2020-04-23 16:23:36 +02:00
Valere	4c4ec6cfe8	Code review accessibility	2020-04-23 16:13:19 +02:00
Valere	449be02f53	update icon tint	2020-04-23 16:05:43 +02:00
Valere	25d2c2e2c6	Update design wait for self verification	2020-04-23 15:45:21 +02:00
onurays	ec2ba7c0b2	Do not warn if the domain of urls are the same and colorize links.	2020-04-23 16:30:37 +03:00
onurays	06a13d5c20	Show a warning dialog if the text of the clicked link does not match the link target ... Fixes #922	2020-04-23 15:42:57 +03:00
Valere	7e0591ffee	Hide Use recovery key when 4S is not setup	2020-04-23 11:14:20 +02:00
Benoit Marty	1363100f94	Create DM: now any userId can be entered, so deal with the case of the userId does not exists. ... Use same string resource value than Riot-Web	2020-04-22 23:03:04 +02:00
Benoit Marty	06cf59bca7	Even if it's not happening, do not add the search term if already present in the results.	2020-04-22 19:20:13 +02:00
Valere	e37dd547b8	code review	2020-04-22 18:50:59 +02:00
Benoit Marty	671c1259af	Merge pull request #1239 from waylon531/develop ... Use a bigger thread pool	2020-04-22 18:23:37 +02:00
Benoit Marty	3d07ccd98e	auto-review. Password could be only spaces...	2020-04-22 18:03:47 +02:00
Benoit Marty	03b9774c56	ktlint	2020-04-22 17:56:13 +02:00
Benoit Marty	0f1ddee71c	Use SwitchCompat	2020-04-22 17:54:25 +02:00
Benoit Marty	855efa93cc	Remove cancel button, useless.	2020-04-22 17:29:34 +02:00