Commit Graph

1329 Commits

Author SHA1 Message Date
Arnfried Griesert 8a41cb72a8 Merge branch 'feature/4231_add_new_loginflow' into 'develop'
MESSENGER-4231 add new loginflow

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!98
2023-03-02 13:09:34 +00:00
JanNiklas Grabowski 7830c3c6f0 MESSENGER-4231 add new loginflow 2023-02-28 18:06:13 +01:00
Arnfried Griesert dfb5e47985 MESSENGER-3948 show hide login password 2023-02-24 12:01:55 +00:00
Arnfried Griesert eb618b395d MESSENGER-4093 scan permalinks as qr 2023-02-23 06:50:16 +00: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
Frank Rotermund 6e560823ef MESSENGER-3895 Fix presentation of two alerts 2023-02-13 08:08:52 +01:00
JanNiklas Grabowski 94b55866e2 MESSENGER-4235 - location sharing without gps 2023-02-09 17:50:33 +01:00
Andy Uhnak 599e20ea01 Fix some crashes 2023-02-09 08:44:31 +00:00
Arnfried Griesert c013098ac9 MESSENGER-3895 qr code login 2023-02-08 12:19:07 +00:00
Alfonso Grillo 18d202f3bd Improve SegmentedPicker UI 2023-02-06 12:36:31 +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
Flescio 67f3401bce Merge pull request #7314 from vector-im/flescio/1040-poll_detail
Details screen of a poll (PSG-1039)
2023-02-01 15:46:08 +01:00
Alfonso Grillo 1e35ff2533 Merge pull request #7324 from vector-im/alfogrillo/sync_polls_rulles_error_handling
Sync polls rules error handling (PSG-1126)
2023-02-01 14:58:36 +01:00
Nicolas Mauri a7d48ea97b Merge pull request #7321 from vector-im/nimau/7311_vb_error_handling
Improve error handling during a voice broadcast playback
2023-02-01 14:44:34 +01:00
Nicolas Mauri bea7421c5e Cleanup 2023-02-01 14:43:38 +01:00
Alfonso Grillo 16e54b7141 Merge branch 'develop' into alfogrillo/sync_polls_rulles_error_handling 2023-02-01 14:07:21 +01:00
Alfonso Grillo 1246b0486c Merge pull request #7320 from vector-im/alfogrillo/sync_polls_rules
Sync polls' push rules (PSG-77, PSG-1097)
2023-02-01 12:47:12 +01:00
Flavio Alescio 14c96a78b0 removed view from viewModel 2023-02-01 12:41:05 +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
Flavio Alescio 5b7bfc5642 fix embedding pattern 2023-02-01 11:15:22 +01:00
Alfonso Grillo 47c6a34bb4 Async-await refactor 2023-02-01 10:47:11 +01:00
Flavio Alescio d1333a8c45 Merge commit '32beb2393ceb08e585e8d62c145d133d9bba5ce6' into flescio/1040-poll_detail 2023-02-01 10:13:28 +01:00
aringenbach 32beb2393c Merge pull request #7317 from vector-im/aringenbach/7316_indentation_support
Labs: Rich text editor: enable list items indentation
2023-02-01 09:44:45 +01:00
Alfonso Grillo 2a764d2805 Merge branch 'develop' into alfogrillo/sync_polls_rules 2023-01-31 19:11:21 +01:00
Flavio Alescio 368892d2ad Merge commit '35d6d9ada3d92068f328e31b547a348ef035380b' into flescio/1040-poll_detail 2023-01-31 16:03:49 +01:00
Flavio Alescio 7b4333e9af code restyle for poll detail 2023-01-31 16:03:38 +01:00
Nicolas Mauri 328f0675a7 Improve error handling during a voice broadcast playback 2023-01-31 11:16:59 +01:00
Nicolas Mauri f6229d1b65 Merge pull request #7302 from vector-im/nimau/7189_vb_decryption_error
Inform the user about decryption errors during a voice broadcast
2023-01-31 10:23:47 +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