67df1a3e95
chore: FOSS Merge 1.27.11 (MESSENGER-7276)
...
Merge commit 'af0b6d4be985d9f26e5111d3fa01389c7321949f' into feature/7276_FOSS_Merge_1_27_11
# Conflicts:
# Config/AppVersion.xcconfig
# Gemfile.lock
# IDETemplateMacros.plist
# Podfile
# Podfile.lock
# README.md
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Room/CellData/RoomBubbleCellData.m
# Riot/target.yml
# RiotNSE/NotificationService.swift
# RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
# RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
# RiotSwiftUI/Modules/Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
# RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
# RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift
# fastlane/Fastfile
2025-05-16 14:06:20 +02:00
77bae312d0
added commercial license
2025-01-23 12:19:12 +01:00
b298dedc22
chore: update from foss 1.11.19 (MESSENGER-6656)
...
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19
* commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1':
finish version++
version++
comments
update submodule
remove obsolete tests
removed unused code
update submodule
fix
Libolm removal
update license macro
update license
Prepare for new sprint
# Conflicts:
# Config/AppVersion.xcconfig
# IDETemplateMacros.plist
# LICENSE
# README.md
# Riot/Categories/MXSession+Riot.m
# Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
# Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
# Riot/Managers/KeyValueStorage/KeyValueStore.swift
# Riot/Managers/KeyValueStorage/KeychainStore.swift
# Riot/Managers/KeyValueStorage/MemoryStore.swift
# Riot/Managers/PushNotification/PushNotificationService.m
# Riot/Managers/Settings/RiotSettings.swift
# Riot/Managers/Settings/Shared/RiotSharedSettings.swift
# Riot/Modules/Analytics/AnalyticsUIElement.swift
# Riot/Modules/Application/AppCoordinator.swift
# Riot/Modules/Application/LegacyAppDelegate.h
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/Legacy/AuthenticationViewController.h
# Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
# Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h
# Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m
# Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
# Riot/Modules/Common/Recents/RecentsViewController.m
# Riot/Modules/Common/WebViewController/WebViewViewController.m
# Riot/Modules/Contacts/Details/ContactDetailsViewController.m
# Riot/Modules/Contacts/Views/ContactTableViewCell.m
# Riot/Modules/Favorites/FavouritesViewController.h
# Riot/Modules/Favorites/FavouritesViewController.m
# Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
# Riot/Modules/People/PeopleViewController.h
# Riot/Modules/People/PeopleViewController.m
# Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift
# Riot/Modules/Room/DataSources/RoomDataSource.m
# Riot/Modules/Room/Files/RoomFilesViewController.m
# Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/Room/Settings/RoomSettingsViewController.m
# Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift
# Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift
# Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift
# Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
# Riot/Modules/Rooms/RoomsViewController.h
# Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift
# Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift
# Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift
# Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift
# Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
# Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift
# Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift
# Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift
# Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
# Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift
# Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift
# Riot/Modules/SetPinCode/PinCodePreferences.swift
# Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
# Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
# Riot/Modules/Settings/Security/SecurityViewController.m
# Riot/Modules/Settings/SettingsViewController.m
# Riot/Modules/SplitView/SplitViewCoordinator.swift
# Riot/Modules/SplitView/SplitViewCoordinatorType.swift
# Riot/Modules/StartChat/StartChatViewController.m
# Riot/Modules/TabBar/MasterTabBarController.h
# Riot/Modules/TabBar/MasterTabBarController.m
# Riot/Utils/EventFormatter.m
# Riot/Utils/HTMLFormatter.swift
# Riot/Utils/Tools.m
# RiotNSE/NotificationService.swift
2024-10-18 15:45:54 +02:00
12837d4b89
update license
2024-09-25 12:24:52 +02:00
1768fb5eee
Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' 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
9df4a5a10b
Inject AvatarViewMode as EnvironmentObject
2023-01-13 12:57:21 +01:00
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
1df0be344d
Removed deprecated StateStoreViewModel dispatching and reducing
2022-09-27 12:55:44 +03:00
fc2fdc8ae7
Removed unnecessary comments from RiotSwiftUI templates, fixed StateStoreViewModel typealias formatting
2022-09-27 12:55:44 +03:00
43c28d23b7
Configured and applied SwiftFormat
2022-09-27 12:55:44 +03:00
226e55caf7
MESSENGER-3304 string in separate files
2022-09-19 11:53:45 +02:00
e6ea10f3a6
Prefix test in-front of UI test methods.
2022-07-18 16:06:27 +01:00
5394ed0f4a
Update use case, registration and login screens.
...
Remove "Custom server" button from use case screen.
Remove matrix.org description.
Add username availability to registration screen.
2022-07-14 16:56:35 +01:00
09cc08d500
Do not start loading on server selection
2022-05-27 17:52:13 +03:00
9c5aa0ca1e
Add Email/Terms/ReCaptcha into the Authentication flow
...
Replace ReCaptcha navigation delegate with a WKUserContentController.
Move callback property closures onto the MainActor.
Show a loading indicator whilst waiting for the authentication service to start.
Move nextUncompletedStage into FlowResult.
Handle text field actions during authentication.
Remove scroll view tweaks in server selection screen following EMS banner removal.
2022-05-19 11:43:38 +01:00
870fc616c5
Use readableFrame and OnboardingIconImage everywhere.
...
Fix order of accentColor modifier.
2022-05-11 09:49:24 +01:00
dcc6e0d3df
Fix layout issues in Use Case screen.
2022-05-11 09:49:24 +01:00
9494c3ca80
Remove iOS 13/14 checks from Template/Onboarding/Authentication.
2022-05-11 09:49:24 +01:00
aac2511ddc
Add email verification screen ( #6125 )
...
Make a reusable onboarding icon view.
Use a native TextField for better dynamic type support.
Rename completion to callback.
Add readableFrame modifier.
2022-05-10 14:09:43 +01:00
512f498ff1
Tweaks to Onboarding following design review.
...
Use constants for consistent top padding and icon sizes.
Match layout of AnalyticsPrompt on iPad to other views.
Update icon in use case selection screen to allow tinting.
2022-03-30 18:55:22 +01:00
bb7e928922
Improve celebration screen layout on iPad
...
Rename OnboardingConstants to OnboardingMetrics.
Fix strings warning about public property in public extension.
Remove unused OnboardingCelebrationViewModelResult.
2022-03-22 12:02:05 +00:00
a867d9a3d4
Add FTUE display name screen.
...
Use UserSession instead of userId & MXSession in OnboardingCoordinator
2022-03-21 17:36:40 +00:00
351cce0128
Make scrollEdgesAppearance singular to match UIKit
2022-03-16 08:58:21 +00:00
38d77063af
Rename OnboardingUseCase to OnboardingUseCaseSelectionScreen
...
Same for OnboardingUseCaseCoordinator.
2022-02-17 11:19:32 +00:00
0624efaa20
Fix tests.
2022-02-04 17:46:27 +00:00
f50a92d0a8
Tweaks to the Use Case screen ready for review.
...
Update strings.
Show the custom server field as needed.
Enable scroll edges appearance for white navigation bar.
2022-02-04 16:10:38 +00:00
295b3eaa99
Add the Use Case selection screen to the onboarding flow.
2022-02-04 16:10:38 +00:00
Frank Rotermund
Mauro Romito
JanNiklas Grabowski
Alfonso Grillo
Stefan Ceriu
Doug
ismailgulek
Doug