3187 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Valere	7c1428e097	preserver relations as non encrypted	2020-03-12 10:05:55 +01:00
Valere	32fd4c1be9	save decryption result at encryption	2020-03-11 19:39:40 +01:00
Valere	f53fc205e1	Fix Message transitions in encrypted rooms ... Fixes #518	2020-03-11 18:07:18 +01:00
Valere	54eca7525e	Version ++	2020-03-11 16:24:49 +01:00
Valere	005a11b765	Merge branch 'release/0.18.0' into develop	2020-03-11 13:41:48 +01:00
Valere	d5cbcdd4e7	prepare release 0.18.0	2020-03-11 13:41:17 +01:00
Valere	fe1af4e34f	Merge pull request #1131 from vector-im/feature/fix_qr_self_verification ... Fix / Self verification mode 1 was not working	2020-03-11 13:19:16 +01:00
Valere	49f2064439	Fix / Self verification mode 1 was not working	2020-03-11 11:43:23 +01:00
Valere	ff5b284b2e	Try to remove rule that is breaking CI	2020-03-11 11:19:22 +01:00
Valere	d9085b1231	Merge pull request #1128 from vector-im/feature/remove_runblocking_crypto ... Remove dangerous runBlocking (and un-needed)	2020-03-11 10:42:48 +01:00
Valere	a9074cdbbb	Remove dangerous runBlocking (and un-nedded)	2020-03-10 17:25:04 +01:00
Benoit Marty	09946ecf1b	Merge pull request #1117 from vector-im/feature/pusher_fix ... Pusher fix	2020-03-10 11:34:11 +01:00
Benoit Marty	d21a536542	Merge pull request #1115 from vector-im/feature/work_manager_script ... Add script to dumpsys work manager data	2020-03-06 17:31:19 +01:00
Benoit Marty	937d497a1f	Revert the check box in case of error	2020-03-06 17:24:57 +01:00
Benoit Marty	4261b0e78a	Fix pusher issue. It was set by mistake when the notification for this device was disabled	2020-03-06 17:19:48 +01:00
Benoit Marty	71446a1a74	Remove useless check	2020-03-06 17:11:23 +01:00
Benoit Marty	a29ec7b0be	Pusher: add a menu to force a refresh of the local data	2020-03-06 16:48:48 +01:00
Benoit Marty	13036a5933	Pusher: update javadoc	2020-03-06 16:37:13 +01:00
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	5008524635	Add script to dumpsys work manager data	2020-03-06 14:52:09 +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