1996 commits

Author	SHA1	Message	Date
ganfra	27207a27ae	Fix "uploads don't work with Room v6" #1558	2020-07-17 20:33:47 +02:00
Benoit Marty	0f9e26efc5	let instead of also	2020-07-15 14:33:01 +02:00
Onuray Sahin	797dcdb48b	Merge branch 'riotx_develop' into rebranding_rebase ... * riotx_develop: (111 commits) Video calls are shown as a voice ones in the timeline (Fixes #1676) Fix regression: not able to create a room without IS configured (Fixes #1679) Fix / view attachment crash + freeze when offline Version++ Prepare release 0.91.5 Fix test compilation issue Fix crash after rebase Add TODO Copy Javadoc to the API class Move internal methods to internal task Latest renaming Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity Rename CreateRoomParamsBuilder to CreateRoomParams for clarity Rename internal class Expose other objects in the builder to create a room ktlint Display threePid invite along with the other invite (code is a bit dirty) Hide right arrow if threepid invite can not be revoked Disable fetching Msisdn, it does not work Revoke ThreePid invitation (#548) ... # Conflicts: # vector/build.gradle # vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt # vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml # vector/src/main/res/values/strings.xml	2020-07-13 19:59:20 +03:00
Benoit Marty	0e28214b63	Do not display the name change popup for a new installation	2020-07-13 14:23:06 +02:00
Benoit Marty	6a4d887941	Merge branch 'develop' into feature/other_fixes	2020-07-13 11:31:25 +02:00
Benoit Marty	139cd051ab	Video calls are shown as a voice ones in the timeline (Fixes #1676)	2020-07-13 10:57:52 +02:00
Benoit Marty	33b2abc3b9	Fix regression: not able to create a room without IS configured (Fixes #1679)	2020-07-13 10:46:51 +02:00
Benoit Marty	ece9fbd3bb	Add TODO	2020-07-11 22:26:21 +02:00
Benoit Marty	602d67155f	Copy Javadoc to the API class	2020-07-11 22:25:21 +02:00
Benoit Marty	75ef491e3e	Move internal methods to internal task	2020-07-11 22:22:21 +02:00
Benoit Marty	0f327fc75f	Latest renaming	2020-07-11 22:17:55 +02:00
Benoit Marty	a456f4c6a5	Rename CreateRoomParamsInternalBuilder to CreateRoomBodyBuilder for clarity	2020-07-11 22:16:35 +02:00
Benoit Marty	e097bd8117	Rename CreateRoomParamsBuilder to CreateRoomParams for clarity	2020-07-11 22:15:26 +02:00
Benoit Marty	ded8acc836	Rename internal class	2020-07-11 22:13:22 +02:00
Benoit Marty	d8a0a1d38e	Expose other objects in the builder to create a room	2020-07-11 22:11:15 +02:00
Benoit Marty	e8f28d7ce4	ktlint	2020-07-11 22:11:15 +02:00
Benoit Marty	4b3a6a883d	CreateRoomParams has been replaced by CreateRoomParamsBuilder, to be able to invite 3pids	2020-07-11 22:10:52 +02:00
Benoit Marty	6c0bb2a949	Add 3Pid to the list. Not compiling, I have to modify CreateRoomParam	2020-07-11 22:08:02 +02:00
Benoit Marty	3842ec6bb0	Invite by msisdn. Error 500 from matrix.org though (#548)	2020-07-11 22:07:14 +02:00
Benoit Marty	ab1d652f17	Invite by email (msisdn not working), command line (#548)	2020-07-11 22:07:14 +02:00
Benoit Marty	70e90d8542	Render third party invite event (#548)	2020-07-11 22:07:14 +02:00
Benoit Marty	37378ca5a6	typo	2020-07-11 21:57:45 +02:00
Benoit Marty	a35749964c	Merge branch 'develop' into feature/fix_small_issues	2020-07-11 21:56:07 +02:00
ganfra	c2cccd8b11	Some changes after benoit's review	2020-07-11 15:26:54 +02:00
ganfra	e7804af2f7	EventInsertLiveObserver: change of delete method (should be faster)	2020-07-11 13:27:49 +02:00
ganfra	0412fabbd2	Clean comment on EventInsertLiveProcessor	2020-07-11 13:24:32 +02:00
Benoit Marty	6f4ea83fa9	Create allKnown() fun	2020-07-11 13:03:53 +02:00
ganfra	1c17bd9f5a	Clean code	2020-07-11 12:57:49 +02:00
ganfra	2f0645a94e	Fix left user has no name in db	2020-07-11 12:39:41 +02:00
Valere	c57d41863f	4S settings screen	2020-07-11 12:37:18 +02:00
ganfra	3fc9fe3017	Merge branch 'develop' into feature/fix_small_issues	2020-07-10 20:13:47 +02:00
ganfra	e07a584d66	Revert fixing users as it's not the good catch	2020-07-10 20:09:30 +02:00
ganfra	150d44aafd	Improve a bit how joining/leaving are handled	2020-07-10 20:08:51 +02:00
Benoit Marty	4741169cc7	Merge pull request #1611 from vector-im/feature/okhttp_for_glide ... Feature/okhttp for glide	2020-07-10 15:54:31 +02:00
Benoit Marty	a8ad57a9b0	Merge pull request #1648 from vector-im/feature/server_recovery_banner ... Feature/server recovery banner	2020-07-10 15:53:58 +02:00
Valere	8582ad6015	Merge pull request #1636 from vector-im/feature/attachement_pager ... Feature/attachement pager	2020-07-10 15:47:32 +02:00
Benoit Marty	f179fc523d	Give configured OkHttpClient to Glide and BigImageViewer	2020-07-10 14:43:07 +02:00
Benoit Marty	6569ee5d10	Use Set instead of List	2020-07-10 14:42:30 +02:00
Benoit Marty	10f8aebde2	Update comment	2020-07-10 14:42:30 +02:00
Benoit Marty	28869f4382	Small cleanup before merge	2020-07-10 12:19:25 +02:00
ganfra	9c595b6c02	Fix "Leave room only leaves the current version"	2020-07-10 08:54:41 +02:00
ganfra	d49d0295a2	Send verification request when the device is not new	2020-07-09 18:31:09 +02:00
ganfra	548879bd9f	Fix encryption enabling visible for all users	2020-07-09 17:20:51 +02:00
Valere	332f227bc1	Signout to setup 4S	2020-07-09 15:45:58 +02:00
Valere	a1db8653ab	Basic Video Support	2020-07-08 20:09:55 +02:00
Valere	4a2a6d34ae	Initial commit	2020-07-08 20:09:55 +02:00
ganfra	75c2dfcd48	Fix user data being affected by local room member event changes	2020-07-08 19:16:22 +02:00
ganfra	3aabb17ea5	Fix timeline pagination when no displayable events	2020-07-08 15:51:00 +02:00
ganfra	e8dbed1642	Fix relations on encrypted room	2020-07-08 14:51:15 +02:00
Benoit Marty	9dc831d8e5	Merge pull request #1634 from vector-im/feature/db_clean_up ... Feature/db clean up	2020-07-07 11:59:28 +02:00