Commit Graph

81 Commits

Author SHA1 Message Date
Arnfried Griesert 7ee488710b Merged element v1.11.9 into bum 2024-04-23 16:13:09 +02:00
Stefan Ceriu a2a40ef15e Remove inherently broken tests 2024-03-19 13:29:27 +02:00
Arnfried Griesert 0fd68a672b Hide change password requirements 2024-03-11 12:37:21 +01:00
Frank Rotermund ef428b3477 MESSENGER-5413 authentication hotspots 2024-01-30 13:23:04 +01:00
Arnfried Griesert 099b861a8d MESSENGER-4951 Changed password confirmation 2023-09-15 12:13:19 +00:00
Frank Rotermund 54dc0322f0 Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' 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 13588db447 Implement MSC3987: Push actions clean-up 2023-06-07 09:31:42 +02:00
Arnfried Griesert 3736b8c9fd Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Arnfried Griesert 285bf4bdc0 merged basis update 1_10_5 into develop 2023-03-21 07:52:11 +01:00
JanNiklas Grabowski 76e0de4e38 MESSENGER-4407 fixes from testprotocol 2023-03-16 16:45:48 +01:00
Arnfried Griesert 28852aa790 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Andy Uhnak 87d43ee3c7 Update startup progress UX 2023-03-10 09:40:48 +00:00
Arnfried Griesert 20ecc8ab46 MESSENGER-3157 third notification settings option 2023-03-07 13:28:09 +00:00
Arnfried Griesert 8f8741c903 More tint color changes 2023-03-06 22:11:23 +01:00
JanNiklas Grabowski b4d4330109 Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' 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 7cdb771c63 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 f1372542b7 DispatchGroup to TaskGroup refactor 2023-02-02 22:48:48 +01:00
Alfonso Grillo 8fc47d5e69 Add UTs 2023-02-02 16:36:50 +01:00
Alfonso Grillo beb0da9d35 Improve NotificationPushRuleType protocol 2023-02-02 15:33:20 +01:00
Alfonso Grillo d269fb726d Add NotificationPushRuleType.pushRuleId 2023-02-02 15:18:52 +01:00
Alfonso Grillo fa6ea2d4a6 Restore MXNotificationSettingsService 2023-02-02 15:08:47 +01:00
Alfonso Grillo d52aa20c9b Refactor PushRulesUpdater 2023-02-02 12:08:55 +01:00
Alfonso Grillo 1114177a16 Move logic in AppConfiguration 2023-02-02 11:04:28 +01:00
Alfonso Grillo 5dc108e4ae Fix rebase issues 2023-02-01 11:41:59 +01:00
Alfonso Grillo 29391c89d5 Improve UT 2023-02-01 11:39:59 +01:00
Alfonso Grillo 3f5beece27 Add error handling for push sync 2023-02-01 11:38:38 +01:00
Alfonso Grillo 4637562c09 Cleanup 2023-02-01 11:28:48 +01:00
Alfonso Grillo 47c6a34bb4 Async-await refactor 2023-02-01 10:47:11 +01:00
Alfonso Grillo 0497927953 Improve tests 2023-01-30 19:15:47 +01:00
Alfonso Grillo 857aa98430 Add UTs 2023-01-30 19:15:47 +01:00
Alfonso Grillo c8ace35b0a Add comment 2023-01-30 19:15:47 +01:00
Alfonso Grillo 52eadbbb7b Add loudest option logic 2023-01-30 19:15:47 +01:00
Alfonso Grillo c708c61d0d Cleanup 2023-01-30 19:15:47 +01:00
Alfonso Grillo 6f5012a38f Add Task to update rules 2023-01-30 19:15:47 +01:00
Alfonso Grillo d08a2fb890 Cleanup 2023-01-30 19:15:47 +01:00
Alfonso Grillo fff2d6f5e5 Refine poll push rule sync logic 2023-01-30 19:15:47 +01:00
Alfonso Grillo 921152e219 Start poll push rule sync logic 2023-01-30 19:15:47 +01:00
Alfonso Grillo 0b71460061 Create private extension of NotificationSettingsViewModel 2023-01-30 19:15:47 +01:00
Alfonso Grillo 3dfd572205 Fix push rule updates call order 2023-01-30 19:15:47 +01:00
Alfonso Grillo c295cf88bb Update NotificationSettingsServiceType 2023-01-30 19:15:47 +01:00
Alfonso Grillo 0e8c78be07 Add missing NotificationPushRuleIds 2023-01-30 19:15:47 +01:00
Alfonso Grillo 10447947b0 Add comment 2023-01-30 19:15:47 +01:00
Alfonso Grillo ddf2693865 Add calls to update polls rules 2023-01-30 19:15:47 +01:00
Alfonso Grillo 861cebd9d0 Add updatePushActions(for:enabled:standardActions) method 2023-01-30 19:15:47 +01:00
Alfonso Grillo d1cc076ab9 Cleanup code 2023-01-30 19:15:47 +01:00
Alfonso Grillo 6027898c26 Add polls rule ids 2023-01-30 19:15:47 +01:00
Frank Rotermund 67dd4f918e Merge commit '35b2fdc538dfc1f8fac2585704526ab26148a9ab' 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
Philippe Loriaux 0a6d7b7f68 Add localization for authentication errors 2022-11-30 15:51:05 +01:00
Frank Rotermund f4ca302faa Merge commit 'ace42be63764c1f1aec82d6e3448ca8980adc784' into feature/3746_merge_element_1.9.10
# Conflicts:
#	Config/AppConfiguration.swift
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Common/Avatar/AvatarView.swift
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	Riot/target.yml
#	fastlane/Fastfile
#	project.yml
2022-11-02 14:05:36 +01:00
Arnfried Griesert 4f407e6923 MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00