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

299 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
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 8f0580ca7e Also hide session selection with OIDC in the device manager. (#7675) 2023-09-13 15:07:49 +01:00
Hugh Nimmo-Smith dde602beac Use ASWebAuthenticationSession to display OIDC account management URL (#7671) 
Co-authored-by: Doug <douglase@element.io>
 2023-09-12 18:05:52 +01: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
JanNiklas Grabowski d4ab5f4bad MESSENGER 5004 add oidc flag 2023-08-31 12:13:03 +02:00
JanNiklas Grabowski ccdbd400d2 Merge commit 'f6b85b8f9a0b4ce162616e79045fb015a21b27da' into feature/5004_basis_update_element 
* commit 'f6b85b8f9a0b4ce162616e79045fb015a21b27da': (40 commits)
  finish version++
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.1)).
  completed
  code improvement
  fix 7646
  opening the safari web view externally so that it will be able to share the cookies
  web view opened on tap + changelog
  added the cell, now I just need to implement the navigation to the web view
  completed
  Hide deactivate account if the auth property is present on the WK.
  Add changelogs
  Prevent mention crashes when room members are missing display names (objc interop)
  Prevent pill crashes when room members are missing display names (objc interop)
  Update introspect to the latest version, remove now duplicate `introspectCollectionView`
  Prepare for new sprint
  finish version++
  Add missing changelog entry.
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)).
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
#	Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/target.yml
 2023-08-29 17:00:19 +02:00
Mauro Romito d1445fc698 completed 2023-08-28 12:20:26 +02:00
Mauro Romito 2a7e0562f1 code improvement 2023-08-25 19:39:55 +02:00
Mauro Romito 2b93d8f03a fix 7646 2023-08-25 17:22:11 +02: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 d933051135 Changed font color for device verification button 2023-05-04 06:57:32 +02: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
JanNiklas Grabowski 1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
 2023-02-15 14:56:55 +01:00
Arnfried Griesert 4d55fd8513 merged release_2_2_0 into develop 2023-01-24 09:24:47 +01:00
Arnfried Griesert 2c7bd61e47 Updated element version to 1.9.14 2023-01-16 14:03:41 +01:00
Frank Rotermund 9f6deb9110 Merge commit '2e9bb7067e9f1596f29b986729822184145906db' into feature/4068_merge_foss_1_9_15 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
 2023-01-16 12:11:51 +01:00
Alfonso Grillo 9df4a5a10b Inject AvatarViewMode as EnvironmentObject 2023-01-13 12:57:21 +01:00
Alfonso Grillo 3d61e33546 Fix UTs 2022-12-30 12:13:56 +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
Frank Rotermund 0fca000b8d Merge commit '3d672a05b2a7117ade2e4e87bd2b5762063d7922' into feature/3977_merge_element_1_9_13 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.xib
#	Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
#	Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/TabBar/MasterTabBarController.m
#	fastlane/Fastfile
 2022-12-19 14:36:30 +01:00
Alfonso Grillo 16572120ee Fix UI tests 2022-12-16 18:23:40 +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 9d797d9eaa Fix UserSessionOverview layout 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 4b37f75444 Fix shield size in UserSessionCardView 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 115e1444ea Fix UserSessionCardView cta top padding 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 5dc7386982 Refine UserOtherSessionsHeaderView layout 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 6f8d4f3c97 Hide verification badge in session card 2022-12-16 17:44:54 +01:00
Alfonso Grillo aae1a10630 Fix background color in session details 2022-12-16 17:44:54 +01:00