4887 commits

Author	SHA1	Message	Date
Valere	c8916ee83c	Udpate since msc 1772	2021-04-28 11:15:58 +02:00
Valere	a8d7c25244	rebase fix	2021-04-28 11:15:58 +02:00
Valere	186024b271	MSC 2946 WIP	2021-04-28 11:15:58 +02:00
Valere	7521a0d3ae	Fix / post rebase issues	2021-04-28 11:15:58 +02:00
Valere	e2578a29ed	Basic space join / use tmp msc id / db model update	2021-04-28 11:15:58 +02:00
Valere	df341d8ea3	Basic peeking preview and join and filter	2021-04-28 11:15:58 +02:00
Valere	c5fa0a413f	Space first commit	2021-04-28 11:15:58 +02:00
Benoit Marty	0a72cc4c93	Merge branch 'develop' into feature/bma/crashRxSingle	2021-04-26 15:17:32 +02:00
Benoit Marty	08cdac3e0d	Handle PR review remarks	2021-04-26 11:05:18 +02:00
Benoit Marty	bcbc6c0f7c	Add missing loading state	2021-04-26 11:00:57 +02:00
Benoit Marty	7309fa547b	Exclude current user from the list of user to invite (#3123)	2021-04-20 19:13:42 +02:00
Benoit Marty	cf69d5c882	Fix small bug about suggestion	2021-04-20 19:11:37 +02:00
Benoit Marty	19e07f6cac	typo	2021-04-20 19:06:32 +02:00
Benoit Marty	f4c1de3c30	Fix exception in rxSingle (#3180) ... Do not wrap CancellationException to Failure.Cancelled, else RxCancellable will throw.	2021-04-20 18:49:16 +02:00
Benoit Marty	5848ec21f7	use orEmpty()	2021-04-20 18:16:03 +02:00
Benoit Marty	2a3694d8b7	Cleanup	2021-04-20 18:12:11 +02:00
Benoit Marty	820531120a	Some formatting and cleanup	2021-04-20 17:33:57 +02:00
Benoit Marty	f086f0e083	Reduce usage of rxSingle when it's easy to do it - case 2	2021-04-20 17:13:48 +02:00
Benoit Marty	5862c8cb60	Reduce usage of rxSingle when it's easy to do it	2021-04-20 17:08:17 +02:00
Benoit Marty	ef1ed28ac5	Fix color issues when the system theme is changed (#2738)	2021-04-20 16:04:59 +02:00
Benoit Marty	19427fbfec	merge hotfix to develop	2021-04-16 14:36:15 +02:00
Benoit Marty	9fc00fe6ff	App crashes on "troubleshoot notifications" button (#3187)	2021-04-16 14:33:00 +02:00
Benoit Marty	c08868bc3c	Protect call to suspend fun	2021-04-16 13:22:16 +02:00
Benoit Marty	9565e8975e	merge hotfix to develop	2021-04-15 11:09:58 +02:00
Benoit Marty	e4375522ff	Fix crash when playing video (#3179)	2021-04-14 22:35:30 +02:00
Benoit Marty	3034d1d831	Merge pull request #3176 from vector-im/feature/bma/login_fixes ... Small fixes on the current sign in sign up flow	2021-04-14 20:13:12 +02:00
Benoit Marty	057295c155	Cleanup	2021-04-14 20:12:57 +02:00
Benoit Marty	877e0ca5c6	compact code	2021-04-14 12:48:33 +02:00
Benoit Marty	89c2662e09	Fix social login button rendering on old OS	2021-04-14 12:44:48 +02:00
Benoit Marty	699b1429b7	Simplify LoginFlowResult model	2021-04-14 12:42:47 +02:00
Onuray Sahin	ce7e00a499	Fix send state image color on dark theme.	2021-04-13 11:48:12 +03:00
Benoit Marty	288aed3252	Merge pull request #3151 from vector-im/feature/bma/cleanup_resources ... Store description update	2021-04-12 10:47:18 +02:00
Dominic Fischer	35667db29c	Lint	2021-04-11 11:35:28 +01:00
Dominic Fischer	759528f19a	Missed another spot ... Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>	2021-04-11 10:54:17 +01:00
Dominic Fischer	7ee87a0d4b	Merge branch 'develop' into suspend_functions_1 ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt	2021-04-10 16:50:30 +01:00
Benoit Marty	37226a1641	Small cleanup	2021-04-09 16:58:41 +02:00
Benoit Marty	93bc5abcb5	Update the Emoji source file	2021-04-09 10:32:11 +02:00
Benoit Marty	5311bacfff	ktlint	2021-04-09 10:26:28 +02:00
Benoit Marty	da7c2e38f6	Merge pull request #3140 from vector-im/feature/bca/verification_as_per_web ... Fix EW-EA compatibility for verification	2021-04-09 10:24:01 +02:00
Benoit Marty	f1e280827d	Ensure there is no dup and cleanup	2021-04-08 19:39:49 +02:00
Matthew Hodgson	1233fde261	Update forbidden_terms.txt	2021-04-08 18:26:55 +01:00
Benoit Marty	153d393bf1	Prevent searching for forbidden terms	2021-04-08 17:28:47 +02:00
Benoit Marty	1715143b85	Filter some other words ... Cannot filter canonical alias anymore, as we now use word boundaries	2021-04-08 16:54:41 +02:00
Valere	760e14531f	Fix EW-EA compatibility for verification	2021-04-08 12:09:35 +02:00
Benoit Marty	3b6234a9a2	Merge pull request #3133 from vector-im/feature/bma/wl_fixes ... Weblate fixes	2021-04-07 19:11:16 +02:00
Benoit Marty	eef6d92b89	Merge pull request #3129 from vector-im/feature/bma/dn_iteration ... Empty room name small iteration	2021-04-07 18:41:08 +02:00
Benoit Marty	e61a9e75e8	Merge pull request #3055 from vector-im/feature/bma/get_event ... Get event	2021-04-07 18:38:17 +02:00
Benoit Marty	47aeadef7c	Add configuration for new Irish language	2021-04-07 18:34:54 +02:00
Benoit Marty	fc202437e8	Fix lint issues	2021-04-07 18:31:46 +02:00
Weblate	eff560f8f0	Merge branch 'origin/develop' into Weblate.	2021-04-07 15:37:02 +00:00