Commit Graph

19 Commits

Author SHA1 Message Date
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
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
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 857aa98430 Add UTs 2023-01-30 19:15:47 +01:00
Alfonso Grillo c708c61d0d Cleanup 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 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
Arnfried Griesert 4f407e6923 MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund 4d1ead2479 MESSENGER-3671 Merge FOSS 1.9.8
Conflicts:
 - CommonConfiguration.swift
 - BuildSettings.swift
 - Generated/images.Swift
 - RoomMemberDetailsViewController.m
 - LiveLocationSharingViewModell
-  PinCodeEnterViewController.m
2022-10-05 15:47:27 +02:00
Stefan Ceriu 89bcd92cca Configured and applied SwiftFormat 2022-09-27 12:55:44 +03:00
Frank Rotermund 37d97d09db MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
David Langley 2d2c67a402 Update RiotSwiftUI symbols to triple slash documentation style with function annotations. 2021-09-13 11:36:33 +01:00
David Langley 007e0a8b6f Move complete room notification settings module to RiotSwiftUI and fix naming/directory structure. 2021-09-02 14:09:29 +01:00
David Langley f4cb404df0 Finish extraction
- Moves SwiftUI code out of Riot and into RiotSwiftUI which has no dependency on Matrix SDK.
- Git wasn't smart enough to see the file moves. Most feature function has remain unchanged. 1 change I did make was remove NotificationSettingsViewModel's dependence on MxPushRule, so that the view model could be moved into RiotSwiftUI.
- Add LocaleProvider to abstract VectorL10n's use of Matrix SDK language so it can be used in RiotSwiftUI.
- Split Theme into UKit/SwiftUI version to remove RiotSwiftUI's dependence on ThemeService and ThemeV1.
- Migrated from ThemeObserver to ThemePublisher. We push updates to ThemePublisher so that we can remove ThemeService as dependency.
- Add .DS_Store to .gitignore
2021-09-01 12:34:38 +01:00