ariskotsomitopoulos b2a2fe2710 Merge branch 'develop' into feature/aris/threads ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt # tools/check/forbidden_strings_in_code.txt # vector/build.gradle # vector/src/main/java/im/vector/app/core/di/FragmentModule.kt # vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt # vector/src/main/java/im/vector/app/features/command/Command.kt # vector/src/main/java/im/vector/app/features/command/CommandParser.kt # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt # vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt # vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt # vector/src/main/java/im/vector/app/features/navigation/Navigator.kt # vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt # vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt # vector/src/main/res/layout/fragment_timeline.xml # vector/src/main/res/xml/vector_settings_labs.xml		2022-01-27 17:11:26 +02:00
..
bug_report.xml	Fix some issue on menu icon colors	2021-06-16 11:34:27 +02:00
home.xml	Rework colors management	2021-06-09 15:36:20 +02:00
home_bottom_navigation.xml	Dial pad tab: second step, add to home	2021-06-02 19:43:39 +02:00
menu_audit.xml	Fix audit freeze, add export, and buffer gossip saves	2020-10-29 12:55:26 +01:00
menu_devtools.xml	Rename some string resources	2022-01-04 14:25:36 +01:00
menu_emoji_reaction_picker.xml	Focus on search bar when opening reaction view	2021-09-27 22:41:34 +05:30
menu_location_preview.xml	Show location preview and allow to share with external apps.	2021-12-27 14:03:59 +03:00
menu_manage_space.xml	Rename some string resources	2022-01-04 14:25:36 +01:00
menu_push_gateways.xml	Fix some issue on menu icon colors	2021-06-16 11:34:27 +02:00
menu_room_directory.xml	Public rooms little rework	2019-06-03 16:44:31 +02:00
menu_space_add_room.xml	Rename some string resources	2022-01-04 14:25:36 +01:00
menu_space_directory.xml	Rework colors management	2021-06-09 15:36:20 +02:00
menu_submit.xml	Rework colors management	2021-06-09 15:36:20 +02:00
menu_thread_list.xml	View all threads screen implementation & UI	2021-11-23 13:34:24 +02:00
menu_timeline.xml	PR Remarks	2022-01-17 17:28:40 +02:00
menu_widget.xml	Rename some string resources	2022-01-04 14:25:36 +01:00
room_list.xml	Mark all as read	2019-10-11 16:22:32 +02:00
vector_attachments_preview.xml	Rename some string resources	2022-01-04 14:25:36 +01:00
vector_call.xml	Call UI: add toolbar	2021-06-30 18:08:44 +02:00
vector_create_direct_room.xml	Create direct room: almost finished, still need to handle showing selected users in search field	2019-07-19 18:12:42 +02:00
vector_invite_users_to_room.xml	Add InviteUsersToRoomActivity and mvrx classes.	2020-04-30 13:54:09 +03:00
vector_media_viewer.xml	Rename some string resources	2022-01-04 14:25:36 +01:00
vector_room_member_profile.xml	Rename some string resources	2022-01-04 14:25:36 +01:00
vector_room_profile.xml	Rename some string resources	2022-01-04 14:25:36 +01:00
vector_room_settings.xml	Rename some string resources	2022-01-04 14:25:36 +01:00