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
..
sampledata	Room profile: make link in room topic clickable	2020-01-16 16:36:56 +01:00
signature	Share the debug signature to all machines which build the debug APK	2019-06-07 10:17:14 +02:00
src	Merge branch 'riotx_develop' into rebranding_rebase	2020-07-13 19:59:20 +03:00
.gitignore	Rename app to vector	2019-04-02 11:24:54 +02:00
build.gradle	Merge branch 'riotx_develop' into rebranding_rebase	2020-07-13 19:59:20 +03:00
lint.xml	Try to remove rule that is breaking CI	2020-03-11 11:19:22 +01:00
proguard-rules.pro	Add proguard command (commented)	2020-07-02 22:02:42 +02:00