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
e5d97ed154
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
Arnfried Griesert
89f8644abc
MESSENGER-3157 third notification settings option
2023-03-07 13:28:09 +00:00
Flescio
d461349e00
Apply (polls) push rules client side for encrypted rooms ( #7356 )
...
* managing dont notify push rule
* private extension for push rule
* remove mentions and keyword notice footer
2023-02-13 11:13:59 +01:00
Alfonso Grillo
8719dc186e
Fix rebase issues
2023-02-01 11:41:59 +01:00
Alfonso Grillo
2b70ef843e
Add error handling for push sync
2023-02-01 11:38:38 +01:00
Alfonso Grillo
6fd560d735
Async-await refactor
2023-02-01 10:47:11 +01:00
Alfonso Grillo
ed64e8ed6d
Add Task to update rules
2023-01-30 19:15:47 +01:00
Stefan Ceriu
43c28d23b7
Configured and applied SwiftFormat
2022-09-27 12:55:44 +03:00
Doug
5fecaea453
Revert "Replace DesignKit with package from ElementX."
...
This reverts the following commits:
ef5365ab240a1449e0490d2eb011dd69f594e27b
545b641e53a845b722f571b48ab408000048714b
702b7a696dd1a8319d6af907d4766a035cf30234
2398c1534dd1ca5b6329c888c50f55fb1b0ec23f
2022-08-19 11:06:09 +01:00
Doug
7d29bca319
Fixup missing colours and use resolved colours in UIKit.
...
Fix the confetti colour when using DesignKit.
Pin swift packages.
Fix UI tests target.
2022-07-07 15:42:57 +01:00
Johannes Marbach
868fd7e0c8
Remove all @available(iOS 14... annotations
2022-06-23 09:47:38 +02:00
Gil Eluard
acf7d0de13
Instrument missing screen metrics ( #5764 )
...
* Instrument missing screen metrics
- Done
2022-03-08 10:13:46 +01:00
Stefan Ceriu
ba9c40cf2d
vector-im/element-ios/issues/5114 - Poll creation screen
...
- added input toolbar poll creation action.
- reordered input toolbar actions as per designs.
- added multiline text field and extracted common components.
2021-11-11 11:24:28 +02:00
David Langley
3d65fbd48f
Update RiotSwiftUI symbols to triple slash documentation style with function annotations.
2021-09-13 11:36:33 +01:00
David Langley
ada377dcf2
Finish extraction
...
- Moves SwiftUI code out of Riot and into RiotSwiftUI which has no dependency on Matrix SDK.
- Git wasn't smart enough to see the file moves. Most feature function has remain unchanged. 1 change I did make was remove NotificationSettingsViewModel's dependence on MxPushRule, so that the view model could be moved into RiotSwiftUI.
- Add LocaleProvider to abstract VectorL10n's use of Matrix SDK language so it can be used in RiotSwiftUI.
- Split Theme into UKit/SwiftUI version to remove RiotSwiftUI's dependence on ThemeService and ThemeV1.
- Migrated from ThemeObserver to ThemePublisher. We push updates to ThemePublisher so that we can remove ThemeService as dependency.
- Add .DS_Store to .gitignore
2021-09-01 12:34:38 +01:00