Onuray Sahin
|
6c10a9bf2d
|
Code review fixes.
|
2022-10-14 18:10:18 +03:00 |
|
Onuray Sahin
|
5953346b3d
|
Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
# vector/src/main/java/im/vector/app/features/VectorFeatures.kt
|
2022-10-14 15:17:55 +03:00 |
|
Hugh Nimmo-Smith
|
343cf74871
|
Add flag to allow QR login on all servers + split flag for showing in device manager
|
2022-10-14 01:45:03 +01:00 |
|
Benoit Marty
|
92a2420952
|
Merge pull request #7293 from vector-im/feature/bma/android13
Android 13
|
2022-10-13 13:52:52 +02:00 |
|
Onuray Sahin
|
1e1affbb7b
|
Merge branch 'develop' into feature/ons/qr_code_login_ui
# Conflicts:
# library/ui-strings/src/main/res/values/strings.xml
# library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
# vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
# vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
# vector/src/main/java/im/vector/app/features/VectorFeatures.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
# vector/src/main/res/layout/fragment_other_sessions.xml
# vector/src/main/res/layout/fragment_settings_devices.xml
|
2022-10-12 14:32:09 +03:00 |
|
Onuray Sahin
|
d8ea9c8215
|
Add flag for qr code login.
|
2022-10-11 20:04:18 +03:00 |
|
Maxime NATUREL
|
7b352b44dc
|
Replacing the feature flag by the new lab flag
|
2022-10-11 17:48:19 +02:00 |
|
Benoit Marty
|
652069d520
|
Manage new Android 13 notification permission.
|
2022-10-06 18:56:23 +02:00 |
|
Florian Renaud
|
0b0ea64a4b
|
Add Voice Broadcast feature flag
|
2022-10-03 09:25:02 +02:00 |
|
Benoit Marty
|
2266723789
|
Remove DefaultSharedPreferences since we now have @DefaultPreferences which provide a singleton.
|
2022-09-22 16:32:14 +02:00 |
|
Florian Renaud
|
e9d809d9c3
|
Move and enable deferred DMs into labs settings
|
2022-09-21 09:36:07 +02:00 |
|
Adam Brown
|
1d50bbdbda
|
fixing manifest imports and giving androidTest its own dedicated manifest
|
2022-09-15 14:50:08 +01:00 |
|
Adam Brown
|
373a0ca4fb
|
split commit to make debug changes to avoid files being seen as new!
|
2022-09-15 14:50:08 +01:00 |
|
Adam Brown
|
5d533d4ec9
|
lifting debug build type to the application module
|
2022-09-15 14:50:08 +01:00 |
|