Frank Rotermund
|
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 |
|
Mauro Romito
|
77bae312d0
|
added commercial license
|
2025-01-23 12:19:12 +01:00 |
|
JanNiklas Grabowski
|
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 |
|
Mauro Romito
|
12837d4b89
|
update license
|
2024-09-25 12:24:52 +02:00 |
|
Arnfried Griesert
|
86aa5365bb
|
MESSENGER-3352 build settings
|
2022-10-27 09:06:24 +00:00 |
|
Doug
|
a832bac643
|
Fix navigation bars inside of VectorHostingController.
|
2022-10-04 16:05:09 +01:00 |
|
Stefan Ceriu
|
43c28d23b7
|
Configured and applied SwiftFormat
|
2022-09-27 12:55:44 +03:00 |
|
Johannes Marbach
|
ce4c8b186c
|
Expand all if and guard constructs involving @available(iOS 14... or #available(iOS 14...
Signed-off-by: Johannes Marbach <johannesm@element.io>
|
2022-06-23 10:05:46 +02:00 |
|
Johannes Marbach
|
868fd7e0c8
|
Remove all @available(iOS 14... annotations
|
2022-06-23 09:47:38 +02:00 |
|
aringenbach
|
f2e14f2512
|
Set HTML formatter as static
|
2022-06-16 09:07:02 +02:00 |
|
aringenbach
|
f8cd8fa96c
|
Improve HTML formatter
|
2022-06-16 09:07:02 +02:00 |
|
Doug
|
ceda5761f4
|
Disable the default analytics configurations for forks. (#5688)
* Disable the default analytics configurations for forks.
* Check the analytics configuration instead of the PostHog Config.
|
2022-02-24 15:46:18 +00:00 |
|
Doug
|
295b3eaa99
|
Add the Use Case selection screen to the onboarding flow.
|
2022-02-04 16:10:38 +00:00 |
|
Stefan Ceriu
|
a9a0bd81c8
|
vector-im/element-ios/issues/5114 - Cleanup + rename PollTimeline to TimelinePoll.
|
2022-01-18 20:05:10 +02:00 |
|
Stefan Ceriu
|
7161b99d1c
|
vector-im/element-ios/issues/5298 - Various tweaks following code review.
|
2022-01-04 17:33:32 +02:00 |
|
Doug
|
0ef348e2ca
|
Address most PR comments.
Update Podfile.lock
|
2021-12-16 17:01:23 +00:00 |
|
Doug
|
70e0eed440
|
Move string formatting to Tools.
Revert contacts tracking from MatrixKit.
Final tweaks before PR.
|
2021-12-16 17:01:22 +00:00 |
|
Doug
|
61f5764cca
|
Support link/html in analytics prompt strings.
Show the new prompt to everyone, even if they previously opted out.
Add docs to Analytics.
|
2021-12-16 17:01:22 +00:00 |
|
Doug
|
ee74bc16fb
|
Add AnalyticsPrompt to SwiftUI target and replace old UIAlertController.
|
2021-12-16 17:01:22 +00:00 |
|