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

93 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 70d591ea00 Remove inherently broken tests 2024-03-19 13:29:27 +02:00
Arnfried Griesert 555ee29643 Hide change password requirements 2024-03-11 12:37:21 +01:00
Frank Rotermund bc7c98448b MESSENGER-5413 authentication hotspots 2024-01-30 13:23:04 +01:00
Arnfried Griesert 667266e93c MESSENGER-4951 Changed password confirmation 2023-09-15 12:13:19 +00: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
Nicolas Mauri c53d4961c9 Implement MSC3987: Push actions clean-up 2023-06-07 09:31:42 +02:00
Arnfried Griesert 6068b228a7 Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Arnfried Griesert 57de18502d merged basis update 1_10_5 into develop 2023-03-21 07:52:11 +01:00
JanNiklas Grabowski cf1317452e MESSENGER-4407 fixes from testprotocol 2023-03-16 16:45:48 +01: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
Andy Uhnak 02413968e0 Update startup progress UX 2023-03-10 09:40:48 +00:00
Arnfried Griesert 89f8644abc MESSENGER-3157 third notification settings option 2023-03-07 13:28:09 +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
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 3ab38a63fd DispatchGroup to TaskGroup refactor 2023-02-02 22:48:48 +01:00
Alfonso Grillo eac3f34630 Add UTs 2023-02-02 16:36:50 +01:00
Alfonso Grillo 11c3a1d880 Improve NotificationPushRuleType protocol 2023-02-02 15:33:20 +01:00
Alfonso Grillo ddc268b01e Add NotificationPushRuleType.pushRuleId 2023-02-02 15:18:52 +01:00
Alfonso Grillo e3573942d7 Restore MXNotificationSettingsService 2023-02-02 15:08:47 +01:00
Alfonso Grillo a3d4a66d1a Refactor PushRulesUpdater 2023-02-02 12:08:55 +01:00
Alfonso Grillo 0de90435fb Move logic in AppConfiguration 2023-02-02 11:04:28 +01:00
Alfonso Grillo 8719dc186e Fix rebase issues 2023-02-01 11:41:59 +01:00
Alfonso Grillo 6029f8e26f Improve UT 2023-02-01 11:39:59 +01:00
Alfonso Grillo 2b70ef843e Add error handling for push sync 2023-02-01 11:38:38 +01:00
Alfonso Grillo 1d94c4776d Cleanup 2023-02-01 11:28:48 +01:00
Alfonso Grillo 6fd560d735 Async-await refactor 2023-02-01 10:47:11 +01:00
Alfonso Grillo 9eedb8fe79 Improve tests 2023-01-30 19:15:47 +01:00
Alfonso Grillo 1332322df9 Add UTs 2023-01-30 19:15:47 +01:00
Alfonso Grillo ce6799f1b1 Add comment 2023-01-30 19:15:47 +01:00
Alfonso Grillo ba7466641f Add loudest option logic 2023-01-30 19:15:47 +01:00
Alfonso Grillo 160b860241 Cleanup 2023-01-30 19:15:47 +01:00
Alfonso Grillo ed64e8ed6d Add Task to update rules 2023-01-30 19:15:47 +01:00
Alfonso Grillo 32edbed792 Cleanup 2023-01-30 19:15:47 +01:00
Alfonso Grillo c9d39b25f3 Refine poll push rule sync logic 2023-01-30 19:15:47 +01:00
Alfonso Grillo 4474f5beab Start poll push rule sync logic 2023-01-30 19:15:47 +01:00
Alfonso Grillo 56c5885686 Create private extension of NotificationSettingsViewModel 2023-01-30 19:15:47 +01:00
Alfonso Grillo 703303a7d4 Fix push rule updates call order 2023-01-30 19:15:47 +01:00
Alfonso Grillo 46b16da3c2 Update NotificationSettingsServiceType 2023-01-30 19:15:47 +01:00
Alfonso Grillo 290dfa0e95 Add missing NotificationPushRuleIds 2023-01-30 19:15:47 +01:00
Alfonso Grillo 1a79c72c5e Add comment 2023-01-30 19:15:47 +01:00
Alfonso Grillo 96402fc6da Add calls to update polls rules 2023-01-30 19:15:47 +01:00
Alfonso Grillo f87be21ab3 Add updatePushActions(for:enabled:standardActions) method 2023-01-30 19:15:47 +01:00
Alfonso Grillo d01d9546c0 Cleanup code 2023-01-30 19:15:47 +01:00
Alfonso Grillo f307d43110 Add polls rule ids 2023-01-30 19:15:47 +01:00