SpiritCroc 65be0039a5 Merge tag 'v1.5.10' into merge-v1.5.10 ... TODO: re-implement our composer constraint changes Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt vector/src/main/AndroidManifest.xml vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.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/MessageComposerAction.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.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/action/CheckIfCanReplyEventUseCase.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt vector/src/main/res/drawable/ic_voice_mic_recording.xml vector/src/main/res/layout/composer_layout.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml vector/src/main/res/layout/composer_rich_text_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml vector/src/main/res/layout/composer_rich_text_layout_constraint_set_fullscreen.xml vector/src/main/res/layout/fragment_timeline.xml vector/src/main/res/layout/view_voice_message_recorder.xml vector/src/main/res/xml/vector_settings_preferences.xml vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt Change-Id: I55e95d86b4bb019544d75dcb653afe05194cd224		2022-12-02 22:03:17 +01:00
..
src	Merge tag 'v1.5.10' into merge-v1.5.10	2022-12-02 22:03:17 +01:00
.gitignore	Create module for ui-styles	2021-06-15 12:23:54 +02:00
build.gradle	Merge tag 'v1.5.4' into merge-v1.5.4	2022-10-28 18:02:53 +02:00