384 Commits

Author	SHA1	Message	Date
Waylon Cude	d20cf484ff	Merge branch 'develop' of https://github.com/vector-im/riotX-android into develop ... Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>	2020-04-16 03:10:06 -07:00
Waylon Cude	ec4458e84a	Updated CHANGES.md ... Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>	2020-04-16 02:50:58 -07:00
Benoit Marty	1372192031	Merge pull request #1091 from vector-im/feature/secure ... Add a setting to prevent screenshot of the application, disabled by default (#1027)	2020-04-16 11:27:59 +02:00
Benoit Marty	ea03f76847	Merge pull request #1129 from vector-im/feature/update_password ... Change password function implemented.	2020-04-16 11:26:33 +02:00
Benoit Marty	17ece54cb0	mimetype field is optional	2020-04-16 10:28:23 +02:00
Benoit Marty	634c8947bd	Merge branch 'develop' into refresh-summary	2020-04-15 17:29:08 +02:00
Benoit Marty	6201a9b8ef	Merge branch 'develop' into feature/fix_download_file	2020-04-15 16:52:40 +02:00
Benoit Marty	1981d2e9ac	Merge pull request #1233 from vector-im/feature/fix_local_echo_no_update ... Fix / sending event not always updating	2020-04-15 16:51:16 +02:00
onurays	f00db49bda	Change password function implemented. ... Fixes #528	2020-04-15 16:38:44 +02:00
Valere	c35d854776	Add shield in composer	2020-04-15 15:37:43 +02:00
Benoit Marty	c0fa259b40	Add a setting to prevent screenshot of the application, disabled by default (#1027)	2020-04-15 15:04:19 +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	e26a0bc9ae	Add Android SDK version	2020-04-15 12:57:15 +02:00
Benoit Marty	6dc517584f	Fix merge issue	2020-04-15 12:56:33 +02:00
Valere	68ca0e9d4b	Fix / sending event not always updating	2020-04-14 17:35:11 +02: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
onurays	7242cbda40	Catch network errors during file downloading. ... Fixes #1229	2020-04-13 17:48:19 +03:00
Valere	ccacd20428	Merge branch 'develop' into feature/verification_unified_emoji	2020-04-10 16:05:33 +02:00
Valere	68323057aa	Update change log	2020-04-10 12:12:21 +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	34dec64d9c	Fixes #1214	2020-04-08 17:56:12 +02:00
Valere	aec49fe542	Change log	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
Christopher Rossbach	3ff5952417	Merge branch 'develop' into improvement-957-catchup-indicator-on-invite	2020-04-07 20:53:31 +02:00
Valere	b480eb3688	Update change log	2020-04-07 19:20:49 +02:00
Christopher Rossbach	5521c094f7	fix typing difference	2020-04-07 17:50:01 +02:00
Christopher Rossbach	222b72a014	Merge branch 'develop' into improvement-957-catchup-indicator-on-invite	2020-04-07 17:46:23 +02:00
Valere	1a436f962f	update change log ... cleaning	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	42d61944b5	Merge pull request #1204 from vector-im/feature/increase_file_log_size ... Increase file logger size	2020-04-03 16:40:18 +02:00
Valere	7ffb6113a4	Increase file logger size	2020-04-03 13:53:34 +02:00
Valere	156e6114c1	Updade change log	2020-04-03 13:43:40 +02:00
Valere	92bf3f1349	Update change log ... + code quality	2020-04-03 11:14:14 +02:00
Christopher Rossbach	dff89cb2e1	document changes ... Signed-off-by: Christopher Rossbach <31703168+duncanturk@users.noreply.github.com>	2020-03-27 14:41:48 +01:00
Onuray Sahin	443d45db6a	Merge branch 'develop' into feature/target-sdk-29	2020-03-27 12:21:39 +03:00
Valere	75e66a6550	Merge branch 'develop' into feature/update_shield_logic	2020-03-26 16:58:01 +01:00
Onuray Sahin	e2f7890bb8	Merge branch 'develop' into feature/target-sdk-29	2020-03-26 17:39:22 +03:00
Valere	5244612ef6	Update shield logic for DM	2020-03-26 14:26:34 +01:00
Valere	e51439ade0	updage change log	2020-03-26 14:10:19 +01:00
onurays	f7cbc01023	Replace deprecated PreferenceManager with androidx version.	2020-03-26 15:56:33 +03:00
onurays	12429d8091	Merge develop into the branch.	2020-03-26 14:39:50 +03:00
Valere	6721f337bd	Merge branch 'develop' into feature/ensure_olm_account_unicity	2020-03-26 12:11:00 +01:00
Valere	535cdf0ef5	Merge pull request #1162 from vector-im/feature/xs_detect_new_session ... Feature/xs detect new session	2020-03-26 12:06:18 +01:00
Valere	4b3c5d5135	update change log	2020-03-26 10:35:43 +01:00
Valere	9a6fe1af4e	Fixes #1174	2020-03-26 09:49:34 +01:00
Valere	e30c17eab7	Update Changes log	2020-03-24 18:09:54 +01:00
Valere	08cfe79625	Merge pull request #1153 from vector-im/feature/fix_841 ... Fixes #841	2020-03-18 14:50:56 +01:00
Valere	14acbb2b4d	Update changes	2020-03-18 12:06:37 +01:00
Valere	286a5081ff	Verif / handle concurrent start ... Fixes #794	2020-03-18 10:07:57 +01:00