Commit Graph

40 Commits

Author SHA1 Message Date
Arnfried Griesert 86aa5365bb MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund a561249ad6 MESSENGER-3671 Merge FOSS 1.9.8
Conflicts:
 - CommonConfiguration.swift
 - BuildSettings.swift
 - Generated/images.Swift
 - RoomMemberDetailsViewController.m
 - LiveLocationSharingViewModell
-  PinCodeEnterViewController.m
2022-10-05 15:47:27 +02:00
Andy Uhnak b41e7fafbf Manual device verification with Crypto V2 2022-09-29 14:34:39 +01:00
Frank Rotermund 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
Gil Eluard edcf221a59 App Layout: fixed reactions background in timeline 2022-08-25 13:51:50 +02:00
Andy Uhnak b8c321b5bb Outgoing SAS User Verification Flow 2022-07-19 12:26:03 +01:00
Arnfried Griesert 990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
Frank Rotermund c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Arnaud Ringenbach 4c5ae7e4da Add cancellable property to secureBackup/recovery coordinators 2022-03-09 10:41:48 +01:00
Arnaud Ringenbach 644aac224b Add cancellable property to secureBackup/recovery coordinators 2022-03-09 10:41:48 +01:00
Doug 86c2b4ebb5 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Stefan Ceriu 92c2a9488f vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-09-30 09:40:12 +03:00
Stefan Ceriu 313e666017 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-09-30 09:40:12 +03:00
Doug 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
Doug 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
manuroe 1a4462eca5 Code Quality: Fix Stève's remarks 2020-08-26 08:32:07 +02:00
manuroe eefd7c3c4b Code Quality: Fix Stève's remarks 2020-08-26 08:32:07 +02:00
manuroe efbca319f0 Code Quality: Make sonar happier
by removing some code smells
2020-08-25 18:54:47 +02:00
manuroe 14f2ed58f1 Code Quality: Make sonar happier
by removing some code smells
2020-08-25 18:54:47 +02:00
SBiOSoftWhare 1163b7cdec Fix some SwiftLint warnings. 2020-05-29 09:35:46 +02:00
SBiOSoftWhare 39b9de06c3 Fix some SwiftLint warnings. 2020-05-29 09:35:46 +02:00
SBiOSoftWhare fb7d86c22f Session verification: Cancel if device is not found. 2020-05-07 12:21:47 +02:00
SBiOSoftWhare f2f212546d Session verification: Cancel if device is not found. 2020-05-07 12:21:47 +02:00
SBiOSoftWhare 71fe7d2985 UserVerificationCoordinator: Integrate manually verify device screen. 2020-05-07 10:54:02 +02:00
SBiOSoftWhare 4a78b53233 UserVerificationCoordinator: Integrate manually verify device screen. 2020-05-07 10:54:02 +02:00
manuroe 3b260c2192 UserVerificationSessionStatusView: Add verifyManually action 2020-05-06 09:45:55 +02:00
manuroe 2f882b904d UserVerificationSessionStatusView: Add verifyManually action 2020-05-06 09:45:55 +02:00
manuroe efb6e351c8 UserVerificationSessionStatusViewController: Add manually verify button 2020-05-05 18:27:36 +02:00
manuroe 8efbce320e UserVerificationSessionStatusViewController: Add manually verify button 2020-05-05 18:27:36 +02:00
manuroe ddd142c8bd KeyVerificationCoordinatorBridgePresenterDelegate: Add keyVerificationCoordinatorBridgePresenterDelegateDidCancel 2020-04-14 12:50:53 +02:00
manuroe 00bf54502d KeyVerificationCoordinatorBridgePresenterDelegate: Add keyVerificationCoordinatorBridgePresenterDelegateDidCancel 2020-04-14 12:50:53 +02:00
SBiOSoftWhare 77b8f5b435 UserVerificationCoordinator: Update with new KeyVerificationCoordinator init. 2020-04-03 16:28:35 +02:00
SBiOSoftWhare b97ae46a2e UserVerificationCoordinator: Update with new KeyVerificationCoordinator init. 2020-04-03 16:28:35 +02:00
SBiOSoftWhare ab7be02eed UserVerificationStartCoordinator: Remove useless delegate methods. 2020-03-26 11:57:29 +01:00
SBiOSoftWhare 62bb07334f UserVerificationStartCoordinator: Remove useless delegate methods. 2020-03-26 11:57:29 +01:00
SBiOSoftWhare cefbfc6be1 Merge branch 'develop' into key_verification_refact 2020-03-19 08:43:55 +01:00
SBiOSoftWhare 5750dbbe92 Merge branch 'develop' into key_verification_refact 2020-03-19 08:43:55 +01:00
SBiOSoftWhare 25e8f7fccf Refactor DeviceVerification prefix classes to KeyVerification where needed. And move key verification related classes into the same module KeyVerification. 2020-03-18 17:39:26 +01:00
SBiOSoftWhare d6296b3150 Refactor DeviceVerification prefix classes to KeyVerification where needed. And move key verification related classes into the same module KeyVerification. 2020-03-18 17:39:26 +01:00