Rebase/element android 1.4.8 #538
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- cases for the personalisation and display name actions
…ctions Restore #5580 "Do not suggest collapse if there is only one section"
…en object and leaks).
…tion Fix rooms section collapsing
…eases whilst the feature is WIP
Claire1817
commented
Apr 11, 2022
Florian14
reviewed
Apr 11, 2022
Florian14
reviewed
Apr 11, 2022
Florian14
reviewed
Apr 11, 2022
Claire1817
changed the title
Conflicts: .github/workflows/build.yml .github/workflows/quality.yml .github/workflows/sanity_test.yml .github/workflows/tests.yml .github/workflows/update-gradle-wrapper.yml README.md build.gradle library/ui-styles/src/main/res/values/palette_mobile.xml vector/build.gradle vector/src/main/java/im/vector/app/core/di/SingletonModule.kt vector/src/main/java/im/vector/app/core/extensions/Fragment.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/timeline/format/DisplayableEventFormatter.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt vector/src/main/res/layout/fragment_user_directory.xml vector/src/main/res/values-cy/strings.xml vector/src/main/res/values-en-rGB/strings.xml vector/src/main/res/values-fr/strings.xml vector/src/main/res/values-si/strings.xml vector/src/main/res/values-sl/strings.xml vector/src/main/res/values-szl/strings.xml vector/src/main/res/values-tlh/strings.xml vector/src/main/res/values-tzm/strings.xml vector/src/main/res/values/strings.xml vector/src/main/res/xml/vector_settings_preferences.xml vector/src/main/res/xml/vector_settings_root.xml
Claire1817
force-pushed
the
rebase/element-android-1.4.8-3
branch
from
ddb9ed9
to
bcfc7ac
Compare
Florian14
approved these changes
Apr 11, 2022
This was referenced Apr 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#497