 Frank Rotermund
|
4d1ead2479
|
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
|
d59dd09195
|
Manual device verification with Crypto V2
|
2022-09-29 14:34:39 +01:00 |
|
|
Frank Rotermund
|
09a0f6334c
|
Merge commit '80bda1906235b6007b98f18fb13681fff587f4a3' 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
|
1f248634da
|
App Layout: fixed reactions background in timeline
|
2022-08-25 13:51:50 +02:00 |
|
|
Andy Uhnak
|
6ad21f35c3
|
Outgoing SAS User Verification Flow
|
2022-07-19 12:26:03 +01:00 |
|
 Arnfried Griesert
|
f1becdd999
|
merged element 1.8.10
|
2022-05-03 12:48:01 +02:00 |
|
|
Frank Rotermund
|
37d97d09db
|
MESSENGER-2762 Initial Merge
|
2022-03-17 15:51:23 +01:00 |
|
 Arnaud Ringenbach
|
010e5d8d9f
|
Add cancellable property to secureBackup/recovery coordinators
|
2022-03-09 10:41:48 +01:00 |
|
 Doug
|
2aec883095
|
Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
|
2022-03-03 09:34:54 +00:00 |
|
 Stefan Ceriu
|
010178f397
|
vector-im/element-ios/issues/4899 - Fixed various localization issues.
|
2021-09-30 09:40:12 +03: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
|
fcebc84337
|
Code Quality: Fix Stève's remarks
|
2020-08-26 08:32:07 +02:00 |
|
|
manuroe
|
c9f495d460
|
Code Quality: Make sonar happier
by removing some code smells
|
2020-08-25 18:54:47 +02:00 |
|
 SBiOSoftWhare
|
6f7803e6eb
|
Fix some SwiftLint warnings.
|
2020-05-29 09:35:46 +02:00 |
|
|
SBiOSoftWhare
|
56ecba6337
|
Session verification: Cancel if device is not found.
|
2020-05-07 12:21:47 +02:00 |
|
|
SBiOSoftWhare
|
473f3d8f5d
|
UserVerificationCoordinator: Integrate manually verify device screen.
|
2020-05-07 10:54:02 +02:00 |
|
|
manuroe
|
f9b777dfdf
|
UserVerificationSessionStatusView: Add verifyManually action
|
2020-05-06 09:45:55 +02:00 |
|
|
manuroe
|
a0b852a792
|
UserVerificationSessionStatusViewController: Add manually verify button
|
2020-05-05 18:27:36 +02:00 |
|
|
manuroe
|
540ff0b736
|
KeyVerificationCoordinatorBridgePresenterDelegate: Add keyVerificationCoordinatorBridgePresenterDelegateDidCancel
|
2020-04-14 12:50:53 +02:00 |
|
|
SBiOSoftWhare
|
2a41fcfece
|
UserVerificationCoordinator: Update with new KeyVerificationCoordinator init.
|
2020-04-03 16:28:35 +02:00 |
|
|
SBiOSoftWhare
|
c58173aac6
|
UserVerificationStartCoordinator: Remove useless delegate methods.
|
2020-03-26 11:57:29 +01:00 |
|
|
SBiOSoftWhare
|
21b48d7960
|
Merge branch 'develop' into key_verification_refact
|
2020-03-19 08:43:55 +01:00 |
|
|
SBiOSoftWhare
|
23a02c362c
|
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 |
|