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
905c6c0951
Merged element v1.11.9 into bum
2024-04-23 16:13:09 +02:00
72061ce4f9
Switch UI tests to iPhone 15, fix the broken ones
2024-03-19 15:56:21 +02:00
bac1bd9650
MESSENGER-5413 other hotspots
2024-01-30 15:13:28 +01:00
48bb8f35db
Fix test
2022-12-05 19:43:29 +01:00
128812eaea
Add tests
2022-11-16 11:18:03 +01:00
092fe9ef59
Merge branch 'develop' into alfogrillo/learn_more_sheet
...
# Conflicts:
# RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
# RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift
2022-11-03 18:25:06 +01:00
d5d2508eb1
Fix failing test
2022-11-03 15:30:13 +01:00
b471d81147
Fix UTs
2022-11-03 14:47:09 +01:00
1405ea0940
Merge branch 'develop' into alfogrillo/learn_more_sheet
...
# Conflicts:
# RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
# RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Coordinator/UserOtherSessionsCoordinator.swift
# RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
# RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
# RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
# RiotSwiftUI/Modules/UserSessions/UserOtherSessions/View/UserOtherSessions.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/UI/UserSessionOverviewUITests.swift
2022-11-03 09:22:47 +01:00
010e006ec6
Cleanup UI tests
2022-10-28 17:00:30 +02:00
9336079cf2
Add UI tests
2022-10-28 11:38:09 +02:00
09ffa615cf
Add UI tests
2022-10-27 17:29:29 +02:00
3279f58ec4
Device Manager: Verify session ( #6832 )
...
* Initial implementation
* Add verificationState to UserSessionInfo
* Listen for changes device changes in the service.
2022-10-11 16:11:52 +01:00
09124c2243
QR login from device manager ( #6818 )
...
* Add link device button into the sessions overview screen
* Run Swift format
* Fix tests
* Fix a crash in tests
* Fix PR remark
2022-10-07 12:58:26 +03:00
8427a87e27
Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen
...
# Conflicts:
# RiotSwiftUI/Modules/UserSessions/UserSessionDetails/UserSessionDetailsViewModel.swift
2022-10-05 11:51:08 +03:00
dccdba9ce9
Cleanup for UserSessionOverviewViewModelTestsc, UserOtherSessionsViewModelTests
2022-10-05 09:18:33 +03:00
1bdd58a7d6
Renamed session to sessionInfo
2022-10-04 15:34:31 +03:00
a964707630
Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Strings.swift
# RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/Unit/UserSessionOverviewViewModelTests.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
# RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
2022-10-04 15:14:59 +03:00
c37b7d434b
Include browser version in parsed user agent (PSG-761) ( #6788 )
...
* Update UserSessionInfo structure to include client version
* Add string for browser
* Update user agent parser to parse browser version too
* Add browser row into the session details
* Add changelog
* Fix tests
* Run Swift format
2022-10-04 10:49:26 +03:00
a0ff481cef
Added support for MSC3881
2022-10-03 13:42:30 +02:00
97be8fef5a
User other sessions screen template
2022-10-03 11:27:12 +03:00
8d9ef7ce1d
Extended device info (PSG-772) ( #6766 )
2022-09-29 15:07:10 +03:00
c22e4dfb1b
Fix tests
2022-09-28 15:36:11 +03:00
ed8d2f1083
Moved isCurrentSession into UserSessionInfo
2022-09-27 15:36:44 +03:00
512e2f7933
Renamed userSession and userSessionInfo to session
2022-09-27 13:57:54 +03:00
43c28d23b7
Configured and applied SwiftFormat
2022-09-27 12:55:44 +03:00
eac1401cc1
Cleaned up various things, mostly removed unnecessary selfs, comments and bad formatting
2022-09-27 09:27:07 +03:00
c073dfd95d
Cleanup
2022-09-26 17:37:22 +03:00
d3a30a8267
Unit and ui tests
2022-09-26 16:58:03 +03:00
6fc2d397d9
Session overview screen
2022-09-26 16:58:02 +03:00
Frank Rotermund
Mauro Romito
JanNiklas Grabowski
Arnfried Griesert
Stefan Ceriu
Alfonso Grillo
Doug
ismailgulek
Aleksandrs Proskurins
Gil Eluard