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
..
array.xml	Import settings from Riot - not all fonctional of course	2019-04-02 18:08:43 +02:00
attr_behavior.xml	Profile room: continue working on it (try to get a nice animation) [WIP]	2019-11-15 20:37:36 +01:00
attrs.xml	Merge branch 'riotx_develop' into rebranding_rebase	2020-07-13 19:59:20 +03:00
attrs_badge_fab.xml	Timeline : add badge on jump to bottom view	2019-09-19 19:12:45 +02:00
attrs_max_height_scroll_view.xml	Direct room: finally handle selection with chips (not as Nad design)	2019-07-25 16:34:27 +02:00
attrs_state_button.xml	Join room from room preview	2019-05-28 17:21:54 +02:00
bools.xml	Disable some unimplemented pref	2019-06-26 17:43:36 +02:00
colors_riot.xml	Identity: import UI/UX From Riot and adapt to RiotX architecture	2020-05-18 17:21:59 +02:00
colors_riotx.xml	Merge branch 'riotx_develop' into rebranding_rebase	2020-07-13 19:59:20 +03:00
config.xml	Do some parameter checks	2020-02-13 06:48:52 +01:00
dimens.xml	code review	2020-02-26 12:20:03 +01:00
donottranslate.xml	Cleanup	2020-01-11 22:12:56 +01:00
font_certs.xml	Refactoring / revert reaction module to package in main module	2019-05-09 18:26:32 +02:00
integers.xml	Login screens: add some animation for Fragment transition (WIP)	2019-11-28 20:36:29 +01:00
strings.xml	Merge branch 'riotx_develop' into rebranding_rebase	2020-07-13 19:59:20 +03:00
style_snackbar.xml	Properly configure Snackbar styles	2020-01-16 12:51:33 +01:00
styles_login.xml	Design review fixes for login screen.	2020-07-13 17:01:48 +03:00
styles_riot.xml	Merge branch 'develop' into rebranding_rebase	2020-07-10 13:05:52 +03:00
text_appearances.xml	Design review fixes for login screen.	2020-07-13 17:01:48 +03:00
theme_black.xml	Fix bottom sheet divider colors.	2020-07-10 13:11:23 +03:00
theme_common.xml	Initial commit	2020-07-08 20:09:55 +02:00
theme_dark.xml	Adjust colors and remove divider between notification settings and leave room action.	2020-07-07 13:12:24 +03:00
theme_light.xml	Fix bottom sheet divider colors.	2020-07-10 13:11:23 +03:00
theme_status.xml	Move some of colors from attrs.xml to colors_riotx.xml	2020-07-02 19:29:45 +03:00
values.xml	Reactions: Display existing reactions below the message	2019-05-14 11:07:53 +02:00