SpiritCroc
|
d44cb85dc7
|
Merge tag 'v1.4.12' into sc
Change-Id: I499d1a654345d59b01881da90e8f5b529ef4dfd2
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
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/query/ReadQueries.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
vector/src/main/java/im/vector/app/AppStateHandler.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.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/timeline/factory/MessageItemFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
vector/src/main/res/layout/item_space_beta_header.xml
|
2022-04-24 11:15:52 +02:00 |
|
Benoit Marty
|
23d2a290ab
|
Global import optimization
|
2022-04-12 16:06:27 +02:00 |
|
SpiritCroc
|
45a5b8ca94
|
[merge] Further merge fixups
Change-Id: I8edf4ac5b67865843a8e3fb28146ba62195bb812
|
2022-01-29 15:56:13 +01:00 |
|
Benoit Marty
|
1c42df7752
|
Move the file to the new module.
|
2022-01-18 14:39:02 +01:00 |
|
Benoit Marty
|
ffad479dad
|
Move the file to the new module.
|
2022-01-18 14:30:59 +01:00 |
|
Benoit Marty
|
b8aaa177c2
|
Add a module library/core-utils as a base module for all util tools
|
2022-01-13 20:28:50 +01:00 |
|