f9409804b1
Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
...
# Conflicts:
# Config/AppVersion.xcconfig
# Config/BuildSettings.swift
# DesignKit/Source/ColorsSwiftUI.swift
# DesignKit/Source/FontsSwiftUI.swift
# DesignKit/Source/ThemeV2.swift
# DesignKit/Variants/Colors/Dark/DarkColors.swift
# DesignKit/Variants/Colors/Light/LightColors.swift
# Podfile.lock
# Riot/Assets/de.lproj/InfoPlist.strings
# Riot/Assets/de.lproj/Vector.strings
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Images.swift
# Riot/Generated/Strings.swift
# Riot/Managers/PushNotification/PushNotificationService.m
# Riot/Managers/Settings/RiotSettings.swift
# Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
# Riot/Modules/Common/Recents/RecentsViewController.m
# Riot/Modules/Communities/Home/GroupHomeViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/SetPinCode/PinCodePreferences.swift
# Riot/Modules/Settings/SettingsViewController.m
# Riot/Modules/TabBar/MasterTabBarController.h
# Riot/Modules/TabBar/MasterTabBarController.m
# Riot/Modules/TabBar/TabBarCoordinator.swift
# fastlane/Fastfile
# project.yml
2022-09-19 14:42:25 +02:00
226e55caf7
MESSENGER-3304 string in separate files
2022-09-19 11:53:45 +02:00
073eb73302
Adapt api changes from key backup module
2022-08-11 13:52:01 +03:00
3bd774211e
NavigationStore: Update public method signature.
2021-10-08 17:15:14 +02:00
004d738898
NavigationStore: Update public method signature.
2021-10-08 17:15:14 +02:00
fbbd4d7111
Use NavigationRouterStore where needed.
2021-10-05 10:48:52 +02:00
00d289259b
Use NavigationRouterStore where needed.
2021-10-05 10:48:52 +02:00
a4075c89cb
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
29d7262e38
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
43f6c44c78
Adopt consolidated logging mechanism ( #4370 )
...
* Adopted the new MXLog and replaced NSLog throughout the application - vector-im/element-ios/issues/4351
* Replaced NSLog() and print() usages with MXLog.debug()
* Added swiftlint rules for NSLog(), print(), println() and os_log()
* Escape paths used to run script build phases for swiftlint and swiftgen
2021-06-03 11:30:07 +03:00
a8b0e8700e
Adopt consolidated logging mechanism ( #4370 )
...
* Adopted the new MXLog and replaced NSLog throughout the application - vector-im/element-ios/issues/4351
* Replaced NSLog() and print() usages with MXLog.debug()
* Added swiftlint rules for NSLog(), print(), println() and os_log()
* Escape paths used to run script build phases for swiftlint and swiftgen
2021-06-03 11:30:07 +03:00
cecb1b0bed
XcodeGen: Remove old files, probably residual from a git mv
2021-02-16 08:44:26 +01:00
f79ca290d6
XcodeGen: Remove old files, probably residual from a git mv
2021-02-16 08:44:26 +01:00
efbca319f0
Code Quality: Make sonar happier
...
by removing some code smells
2020-08-25 18:54:47 +02:00
14f2ed58f1
Code Quality: Make sonar happier
...
by removing some code smells
2020-08-25 18:54:47 +02:00
b58073ec44
KeyBackupRecoverCoordinatorBridgePresenter: Add possibility to push key backup recover flow from a UINavigationController.
2020-06-15 16:18:05 +02:00
00b341d62f
KeyBackupRecoverCoordinatorBridgePresenter: Add possibility to push key backup recover flow from a UINavigationController.
2020-06-15 16:18:05 +02:00
2ba4f68df4
KeyBackupRecoverCoordinator: Handle existing navigationRouter if needed.
2020-06-15 16:14:31 +02:00
f8e92f58ce
KeyBackupRecoverCoordinator: Handle existing navigationRouter if needed.
2020-06-15 16:14:31 +02:00
c068735b80
Fix Manu's remarks
2020-06-10 17:06:47 +02:00
72e9054350
Fix Manu's remarks
2020-06-10 17:06:47 +02:00
c796eeb428
Merge remote-tracking branch 'origin/rior_3053' into rior_3053
2020-04-08 18:29:56 +02:00
21f2237af1
Merge remote-tracking branch 'origin/rior_3053' into rior_3053
2020-04-08 18:29:56 +02:00
914da2f209
Fix Steve's comment
2020-04-08 18:29:37 +02:00
38e5a1220a
Fix Steve's comment
2020-04-08 18:29:37 +02:00
3786cfde6c
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
7ee6dea00a
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
db3c417716
Key Backup: Use legacy screens if the private key does not work
2020-04-08 16:48:12 +02:00
14f707c2e5
Key Backup: Use legacy screens if the private key does not work
2020-04-08 16:48:12 +02:00
f7112a5698
Key Backup: Add a screen for recovering with the local private key
2020-04-08 15:52:04 +02:00
641025fac4
Key Backup: Add a screen for recovering with the local private key
2020-04-08 15:52:04 +02:00
103aaa3a0a
Fix SwiftLint warnings
2019-02-27 10:07:51 +01:00
9ab0b74007
Fix SwiftLint warnings
2019-02-27 10:07:51 +01:00
c82c73dccb
Key recovery: Trust on decrypt
...
Fixed Steve's comments
2019-02-14 17:30:53 +01:00
d2cfad6258
Key recovery: Trust on decrypt
...
Fixed Steve's comments
2019-02-14 17:30:53 +01:00
32c323f4d2
Key recovery: Trust on decrypt
...
Fixed Steve's comments
2019-02-14 17:28:29 +01:00
2921cac300
Key recovery: Trust on decrypt
...
Fixed Steve's comments
2019-02-14 17:28:29 +01:00
0320b7bc25
Key recovery: Show errors on invalid passphrase or recovery key
2019-02-14 13:14:00 +01:00
d5f6cd932d
Key recovery: Show errors on invalid passphrase or recovery key
2019-02-14 13:14:00 +01:00
e790466a1b
Key recovery: Trust on decrypt
...
#2223
2019-02-14 12:48:54 +01:00
1ab6506a39
Key recovery: Trust on decrypt
...
#2223
2019-02-14 12:48:54 +01:00
7eb133d51c
Key recovery: Do not show anymore an error for empty backup
2019-02-14 12:46:53 +01:00
217c603fa1
Key recovery: Do not show anymore an error for empty backup
2019-02-14 12:46:53 +01:00
2696ea7b7d
Key backup: Update SDK api break
2019-02-14 12:28:56 +01:00
3d6b46c71c
Key backup: Update SDK api break
2019-02-14 12:28:56 +01:00
fb660bea62
Update key backup logo on key backup recover screens
2019-02-13 14:58:17 +01:00
765859b6b1
Update key backup logo on key backup recover screens
2019-02-13 14:58:17 +01:00
e28b111adf
Update key backup recover coordinator initializers to give right instance of MXKeyBackup
2019-01-30 15:55:25 +01:00
ea126329cd
Update key backup recover coordinator initializers to give right instance of MXKeyBackup
2019-01-30 15:55:25 +01:00
d38ee48549
Fix Manu's remarks
2019-01-30 15:35:57 +01:00
Frank Rotermund
ismailgulek
SBiOSoftWhare
Doug
Stefan Ceriu
manuroe
manuroe