Commit Graph

134 Commits

Author SHA1 Message Date
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
Frank Rotermund bac1bd9650 MESSENGER-5413 other hotspots 2024-01-30 15:13:28 +01:00
Frank Rotermund 02bb97687d Feature/5308 sso on internal browser 2023-12-08 11:42:02 +00:00
Arnfried Griesert 20ed25468c Hide IP addresses in session manager 2023-10-04 08:57:33 +02:00
Arnfried Griesert 3c2c021287 Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
Doug a7c8905b10 Hide sign out x/all buttons in the Device Manager when using OIDC. (#7674) 2023-09-12 13:46:36 +01:00
Frank Rotermund 242e35fdc7 Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' into feature/4884_merge_foss_1.10.14
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile
2023-07-04 08:24:05 +02:00
Alfonso Grillo 955d9ef1f2 Fix initial state 2023-05-29 15:19:55 +02:00
Alfonso Grillo 235f324eaa Handle offline issue in UserSessionsDataProvider 2023-05-29 14:52:38 +02:00
Arnfried Griesert d9f9798643 MESSENGER-4516 device manager anpassungen 2023-04-28 06:28:47 +00:00
Alfonso Grillo 9df4a5a10b Inject AvatarViewMode as EnvironmentObject 2023-01-13 12:57:21 +01:00
Alfonso Grillo 816ec1c457 Fix display session name 2022-12-30 11:37:06 +01:00
Alfonso Grillo 09365943c3 Update fonts 2022-12-19 17:59:38 +01:00
Alfonso Grillo 151f3ac81a Update chevron image 2022-12-19 15:12:52 +01:00
Alfonso Grillo f1f8544e7c Fix chevron icon 2022-12-16 17:44:54 +01:00
Alfonso Grillo fbbe69fc0d Add line limit for sessions’ names 2022-12-16 17:44:54 +01:00
Alfonso Grillo 995e67776b Fix font 2022-12-16 17:44:54 +01:00
Alfonso Grillo e1291c8ff6 Fix icon alignment in UserSessionListItem 2022-12-16 17:44:54 +01:00
Alfonso Grillo 04df68cc18 Add missing separators in UserSessionsOverview 2022-12-16 17:44:54 +01:00
Alfonso Grillo c8490bf51f Fix borders 2022-12-16 17:44:54 +01:00
Alfonso Grillo 4b8693e356 Fix paddings in UserSessionsOverview 2022-12-16 17:44:54 +01:00
Alfonso Grillo 3c8511273b SecurityRecommendationCard H spacing 2022-12-16 17:44:54 +01:00
Alfonso Grillo b918c2ccd3 Fix security recommendations layout 2022-12-16 17:44:54 +01:00
Alfonso Grillo aed8b49599 Fix landscape layout in UserSessionsOverview 2022-12-16 17:44:54 +01:00
Alfonso Grillo d1c63bd685 Fix info in UserSessionCardView 2022-12-16 17:44:54 +01:00
Alfonso Grillo 4b4ca83932 Fix security card tappability 2022-12-16 17:44:54 +01:00
Alfonso Grillo da14628802 Refine UTs 2022-12-13 15:45:37 +01:00
Alfonso Grillo 4201c0060e Add UTs 2022-12-13 15:35:18 +01:00
Alfonso Grillo a423199aa4 Delete old devices in account data 2022-12-13 14:19:55 +01:00
Alfonso Grillo a3959fe3d2 Add VerificationState.isUnverified 2022-11-18 10:50:53 +01:00
Alfonso Grillo 6bd006337e Improve unit tests 2022-11-16 11:52:22 +01:00
Alfonso Grillo 30d7509f73 Fix verification state algorithm 2022-11-16 10:29:04 +01:00
Alfonso Grillo cbcf150fc3 Merge pull request #7065 from vector-im/alfogrillo/increase_dm_code_coverage
Increase dm code coverage (PSG-925)
2022-11-11 18:46:02 +01:00
paleksandrs 866796b484 Fixup session list item is not tappable everywhere 2022-11-11 09:55:33 +02:00
paleksandrs 9b57da21a7 Revert "Device Manager: Session list item is not tappable everywhere"
This reverts commit e6367cba4c8f0cb2cdfe5e3381dcbb7bc0f94c52.
2022-11-11 09:29:55 +02:00
Alfonso Grillo 0090fa9b10 Cleanup unused code 2022-11-10 12:12:32 +01:00
Alfonso Grillo 8ffc92b1fe Cleanup tests 2022-11-10 10:35:10 +01:00
paleksandrs e6efe4eb39 Device Manager: Session list item is not tappable everywhere 2022-11-04 15:50:37 +02:00
Alfonso Grillo 0d2b7a85da Add animations 2022-11-03 14:55:33 +01:00
Alfonso Grillo 7c8038ef36 Cleanup merge leftovers 2022-11-03 14:50:46 +01:00
Alfonso Grillo b471d81147 Fix UTs 2022-11-03 14:47:09 +01:00
Alfonso Grillo 6eb67dbdd0 Mock settings in UserSessionsOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo fcbd780370 Refine settings logic 2022-11-03 14:47:08 +01:00
Alfonso Grillo d688600156 Add location info in UserOtherSessions 2022-11-03 14:47:08 +01:00
Alfonso Grillo e6e7e7c5d4 Add show/hide ip persistency 2022-11-03 14:47:08 +01:00
Alfonso Grillo 2045dfdaa0 Cleanup 2022-11-03 14:47:08 +01:00
Alfonso Grillo d7f8aefdb0 Cleanup code 2022-11-03 14:47:08 +01:00