SpiritCroc
|
f5afdefe2f
|
Merge tag 'v1.4.4' into sc
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50
Conflicts:
library/ui-styles/src/main/res/values/dimens.xml
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
vector/src/main/AndroidManifest.xml
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
vector/src/main/res/drawable/bg_unread_notification.xml
vector/src/main/res/drawable/ic_add_reaction_small.xml
vector/src/main/res/layout/item_room.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/xml/vector_settings_preferences.xml
|
2022-03-10 13:26:09 +01:00 |
|
Benoit Marty
|
0087f72309
|
Improve doc
|
2022-02-23 18:28:08 +01:00 |
|
Benoit Marty
|
03a6a348c0
|
Add boolean for visibility of all settings at root level
|
2022-02-23 18:19:24 +01:00 |
|
Benoit Marty
|
830fca731c
|
Move setting for preference in a dedicated file
|
2022-02-23 18:10:56 +01:00 |
|
Benoit Marty
|
96c2c6f4a4
|
Move file config.xml to the module vector-config
|
2022-02-23 18:10:08 +01:00 |
|
Benoit Marty
|
e3209fd04a
|
Create module vector-config
|
2022-02-23 18:08:04 +01:00 |
|