3168 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Benoit Marty	35179509f2	Merge pull request #1111 from vector-im/feature/verification_code ... Feature/verification code	2020-03-06 15:02:57 +01:00
Benoit Marty	147766176c	Merge pull request #1090 from vector-im/feature/notif ... Restore the push rule settings	2020-03-06 14:43:33 +01:00
Benoit Marty	23862cb3d0	Merge branch 'develop' into feature/notif	2020-03-06 14:43:23 +01:00
Benoit Marty	2b8e2a312b	Avoid use toImmutableList()	2020-03-06 14:39:33 +01:00
Benoit Marty	62fdb4c27a	Use getOrPut()	2020-03-06 14:37:30 +01:00
Benoit Marty	b929a2f185	Merge pull request #1099 from vector-im/feature/fix_share_image ... Share images from clear and encrypted rooms.	2020-03-06 14:27:47 +01:00
Benoit Marty	fb858bc112	Rename to respect naming convention #3	2020-03-06 14:04:02 +01:00
Benoit Marty	5d0e917f04	Rename to respect naming convention #2	2020-03-06 13:50:00 +01:00
Benoit Marty	e420070066	Rename to respect naming convention	2020-03-06 13:40:35 +01:00
Benoit Marty	4504308f25	Less "!!"	2020-03-06 13:34:12 +01:00
onurays	05683967c0	Code review fixes.	2020-03-06 12:07:38 +01:00
Benoit Marty	23c20acff1	Remove TODO	2020-03-06 10:11:30 +01:00
Benoit Marty	be5e6eaa93	Rename parameter type for code clarity	2020-03-06 10:10:16 +01:00
Onuray Sahin	555863fecc	Merge pull request #1112 from vector-im/feature/navigate_to_profile_from_avatar ... Open room member profile from avatar of the room member state event.	2020-03-06 09:42:32 +01:00
onurays	b187699a86	Open room member profile from avatar of the room member state event.	2020-03-05 18:44:34 +01:00
Benoit Marty	d891da39e6	Merge pull request #1104 from vector-im/feature/buildkite ... Pipeline file for Buildkite is now hosted on another Github repository	2020-03-05 18:20:17 +01:00
Benoit Marty	f37cd8cddc	Merge pull request #1110 from vector-im/feature/cleanup ... Cleanup	2020-03-05 18:18:49 +01:00
Benoit Marty	2d456d93a7	Common code step 2	2020-03-05 18:16:05 +01:00
Benoit Marty	de36a28541	Common code step 1	2020-03-05 18:00:35 +01:00
Benoit Marty	4634b963a2	Code cleanup	2020-03-05 17:55:13 +01:00
Benoit Marty	b3f887ca28	Code quality	2020-03-05 17:30:34 +01:00
Benoit Marty	3425dd0a63	Make the tests compile and pass	2020-03-05 17:28:35 +01:00
Benoit Marty	2a774833ec	More optimization	2020-03-05 17:11:52 +01:00
Benoit Marty	bda4bbb59c	More optimization	2020-03-05 16:45:49 +01:00
Benoit Marty	0828f9270e	Create asValidObject method - make it works	2020-03-05 16:23:56 +01:00
Benoit Marty	e326631752	Create asValidObject method - make it compiles #2	2020-03-05 15:39:01 +01:00
Benoit Marty	a3f8a53a52	Create asValidObject method - make it compiles.	2020-03-05 15:29:44 +01:00
Benoit Marty	7b5a50ec6e	Create asValidObject method - not compiling	2020-03-05 12:06:19 +01:00
Benoit Marty	36c52d24a7	Move method to interface step 3	2020-03-05 11:24:35 +01:00
Benoit Marty	1b29c7bf91	Move method to interface step 2	2020-03-05 11:22:42 +01:00
Benoit Marty	b6aee04e24	Move method to interface step 1	2020-03-05 11:21:44 +01:00
Benoit Marty	a264dcf5c4	Lint: fix TextFields	2020-03-05 11:09:58 +01:00
Benoit Marty	37afc983c3	Fix typos. The typos has been fixed on Weblate by me.	2020-03-05 11:02:14 +01:00
Benoit Marty	b10e9c54b4	Add BinaryOperationInTimber lint rule and fix existing errors	2020-03-05 10:40:36 +01:00
onurays	03d2cd0639	Lint fix.	2020-03-04 17:57:57 +01:00
onurays	b7ad50a3ce	Make mimeType private to encourage using getSafeMimeType() method.	2020-03-04 16:52:52 +01:00
onurays	9cbaadedfb	Unused context parameter is removed.	2020-03-04 16:52:08 +01:00
Benoit Marty	d6cdcc60d1	Remove unused png files	2020-03-04 16:48:13 +01:00
Onuray Sahin	1680cd8d8e	Merge branch 'develop' into feature/fix_share_image	2020-03-04 16:27:01 +01:00
onurays	d4384328fe	Use "image/jpeg" instead of "image/jpg"	2020-03-04 16:26:09 +01:00
Benoit Marty	5fd8425289	Remove unused files	2020-03-04 16:09:37 +01:00
Benoit Marty	dcb618c257	Merge pull request #1103 from vector-im/feature/space_in_passwords ... Detect spaces in password if user fails to login (#1038)	2020-03-04 14:12:20 +01:00
Benoit Marty	277ad9e042	Merge branch 'develop' into feature/space_in_passwords	2020-03-04 14:12:12 +01:00
onurays	26d387cc12	Support sharing other media types.	2020-03-04 13:47:48 +01:00
Benoit Marty	4aebe6d303	Disable TravisCI checks, now done by Buildkite	2020-03-04 12:23:25 +01:00
Benoit Marty	7eccda6e25	Pipeline file for Buildkite is now hosted on another Github repository ... https://github.com/matrix-org/pipelines/blob/master/riotx-android/pipeline.yml	2020-03-04 12:20:09 +01:00
Benoit Marty	78bc2bbaa5	AndroidStudio cleanup	2020-03-04 12:15:33 +01:00
Benoit Marty	cde068f267	Merge pull request #1079 from vector-im/feature/ftue ... FTUE: do not display a different color when encrypting message when not in developer mode.	2020-03-04 12:14:24 +01:00
Benoit Marty	c8f43e73e2	Merge branch 'develop' into feature/ftue	2020-03-04 12:14:07 +01:00
Benoit Marty	f106f92d7e	Merge pull request #1085 from vector-im/feature/ktlint_upgrade ... ktlint 0.36.0, Chromebook support, Camera for QR code scanning	2020-03-04 12:11:19 +01:00