 JanNiklas Grabowski
|
b4d4330109
|
Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' into feature/4260_merge_foss_1_10_2
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
# Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
# Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
# Riot/Modules/Home/AllChats/AllChatsViewController.swift
# Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
# Riot/Modules/Room/Settings/RoomSettingsViewController.m
# fastlane/Fastfile
|
2023-02-15 14:56:55 +01:00 |
|
 Andy Uhnak
|
8c76c4a1ca
|
Display backup import progress
|
2023-02-02 16:42:49 +00:00 |
|
 Frank Rotermund
|
0a2fd53134
|
MESSENGER-3304 string in separate files
|
2022-09-19 11:53:45 +02:00 |
|
 Doug
|
c411097256
|
Fix class keyword deprecation warnings everywhere!
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
|
2021-07-09 17:05:43 +01:00 |
|
 manuroe
|
c9f495d460
|
Code Quality: Make sonar happier
by removing some code smells
|
2020-08-25 18:54:47 +02:00 |
|
|
manuroe
|
8572f2d44d
|
Merge remote-tracking branch 'origin/rior_3053' into rior_3053
|
2020-04-08 18:29:56 +02:00 |
|
|
manuroe
|
ae72e85abf
|
Fix Steve's comment
|
2020-04-08 18:29:37 +02:00 |
|
 manuroe
|
ac3bead5a8
|
Update Riot/Modules/KeyBackup/Recover/PrivateKey/KeyBackupRecoverFromPrivateKeyViewState.swift
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
|
2020-04-08 18:25:42 +02:00 |
|
|
manuroe
|
5c2f2ec42d
|
Key Backup: Use legacy screens if the private key does not work
|
2020-04-08 16:48:12 +02:00 |
|
|
manuroe
|
e44e91b60a
|
Key Backup: Add a screen for recovering with the local private key
|
2020-04-08 15:52:04 +02:00 |
|