felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 00:52:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,432 Commits 1 Branch 67 Tags
a8a2fa9a48caccd31eefc2de6a9af6e060b895c7
Commit Graph

81 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
Arnfried Griesert 905c6c0951 Merged element v1.11.9 into bum 2024-04-23 16:13:09 +02:00
Stefan Ceriu 72061ce4f9 Switch UI tests to iPhone 15, fix the broken ones 2024-03-19 15:56:21 +02:00
Frank Rotermund bac1bd9650 MESSENGER-5413 other hotspots 2024-01-30 15:13:28 +01:00
Arnfried Griesert d9f9798643 MESSENGER-4516 device manager anpassungen 2023-04-28 06:28:47 +00:00
Arnfried Griesert d5d299a357 More tint color changes 2023-03-06 22:11:23 +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 995e67776b Fix font 2022-12-16 17:44:54 +01:00
Alfonso Grillo 9d797d9eaa Fix UserSessionOverview layout 2022-12-16 17:44:54 +01:00
Alfonso Grillo cbfbf6c51b Fix nav bar item color 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 48bb8f35db Fix test 2022-12-05 19:43:29 +01:00
Alfonso Grillo 128812eaea Add tests 2022-11-16 11:18:03 +01:00
Alfonso Grillo be61cf8b12 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-08 17:04:20 +01:00
Aleksandrs Proskurins 775784150e Merge pull request #7023 from vector-im/aleksandrs/7022_hide_push 
Hide push toggles for http pushers when there is no server support
 2022-11-07 15:24:25 +02:00
Alfonso Grillo 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
Alfonso Grillo b4d5c3b904 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-03 17:29:01 +01:00
Alfonso Grillo d5d2508eb1 Fix failing test 2022-11-03 15:30:13 +01:00
Alfonso Grillo b471d81147 Fix UTs 2022-11-03 14:47:09 +01:00
Alfonso Grillo 4f2cf3d6d7 Inject setting service in UserSessionOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo fcbd780370 Refine settings logic 2022-11-03 14:47:08 +01:00
Alfonso Grillo d7f8aefdb0 Cleanup code 2022-11-03 14:47:08 +01:00
Alfonso Grillo f787043129 Add “show location“ feature in session overview 2022-11-03 14:46:19 +01:00
paleksandrs 2ed307bf1f Code review fixes 2022-11-03 13:38:23 +02:00
Alfonso Grillo 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
paleksandrs e8e349aa67 Merge branch 'develop' into aleksandrs/6963_multi_session_logout 2022-11-02 14:02:52 +02:00
paleksandrs 338da551ef Hide push toggles for http pushers when there is no server support 2022-11-02 13:36:58 +02:00
Alfonso Grillo 010e006ec6 Cleanup UI tests 2022-10-28 17:00:30 +02:00
Alfonso Grillo b5b6154a39 Show bottom sheet in other sessions screen 2022-10-28 15:50:35 +02:00
Alfonso Grillo da07f67573 Add MVVM-C for InfoSheet 2022-10-28 15:14:42 +02:00
Alfonso Grillo f5162834ea Add .viewSessionInfo view action 2022-10-28 12:06:56 +02:00
Alfonso Grillo 9336079cf2 Add UI tests 2022-10-28 11:38:09 +02:00
Alfonso Grillo d26c919f80 Refine InfoView 2022-10-28 11:38:09 +02:00
Alfonso Grillo 7560a5a978 Show bottom sheet in user other sessions 2022-10-28 11:38:09 +02:00
Alfonso Grillo a6c2a8ae63 Add inactive sessions copy 2022-10-28 11:38:09 +02:00
Alfonso Grillo 0798b262cf Localise content 2022-10-28 11:38:09 +02:00
Alfonso Grillo 98efc014c7 Add bottom sheet modifier 2022-10-28 11:38:09 +02:00
Alfonso Grillo 42a3d14339 Add UserSessionOverviewViewBindings 2022-10-28 11:38:09 +02:00
Alfonso Grillo 24b9e25649 Add empty onLearnMoreAction closure 2022-10-28 11:38:09 +02:00
Alfonso Grillo 09ffa615cf Add UI tests 2022-10-27 17:29:29 +02:00
Alfonso Grillo fb314813a3 Improve kebab menu in UserSessionOverview 2022-10-27 17:29:29 +02:00
Aleksandrs Proskurins c19cb59604 Sing out filtering 2022-10-27 17:35:39 +03:00
Doug 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
Doug efaf98fe6a Device Manager: Rename Session (#6826) 
* Publish the user sessions overview data.
* Add UserSessionName screen.
* Update logout action to match Figma more closely.
 2022-10-11 13:11:15 +01:00
ismailgulek 969c51db1e Ignore OS version from web based sessions (PSG-826) (#6852) 
* Ignore OS version from web based sessions

* Add changelog
 2022-10-11 14:39:36 +03:00
ismailgulek 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