mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:55:41 +00:00
Merge branch 'develop' into feature/fga/room-version-upgrade
This commit is contained in:
@@ -23,6 +23,7 @@ forbiddenTerms = {
|
||||
"screen_onboarding_welcome_title",
|
||||
# Contains "Element Call"
|
||||
"screen_incoming_call_subtitle_android",
|
||||
"call_invalid_audio_device_bluetooth_devices_disabled",
|
||||
# Contains "Element X"
|
||||
"screen_room_timeline_legacy_call",
|
||||
]
|
||||
|
||||
@@ -169,6 +169,7 @@
|
||||
"session_verification_banner_.*",
|
||||
"confirm_recovery_key_banner_.*",
|
||||
"banner\\.set_up_recovery\\..*",
|
||||
"banner\\.battery_optimization\\..*",
|
||||
"full_screen_intent_banner_.*",
|
||||
"screen_migration_.*",
|
||||
"screen_invites_.*"
|
||||
@@ -243,6 +244,12 @@
|
||||
"screen_polls_history_.*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name" : ":features:poll:api",
|
||||
"includeRegex" : [
|
||||
"a11y\\.polls\\..*"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name" : ":features:securebackup:impl",
|
||||
"includeRegex" : [
|
||||
|
||||
Reference in New Issue
Block a user