Commit graph

18376 commits

Author SHA1 Message Date
Alfonso Grillo
98fbdb4f16 Fix push rule updates call order 2023-01-30 19:15:47 +01:00
Alfonso Grillo
f81db7c335 Update NotificationSettingsServiceType 2023-01-30 19:15:47 +01:00
Alfonso Grillo
d7dd9cacab Add missing NotificationPushRuleIds 2023-01-30 19:15:47 +01:00
Alfonso Grillo
b867e89fc7 Fix build errors after api change 2023-01-30 19:15:47 +01:00
Alfonso Grillo
a96d732fef Add comment 2023-01-30 19:15:47 +01:00
Alfonso Grillo
5a157461c5 Add calls to update polls rules 2023-01-30 19:15:47 +01:00
Alfonso Grillo
96e01efaf7 Add updatePushActions(for:enabled:standardActions) method 2023-01-30 19:15:47 +01:00
Alfonso Grillo
eae9b2fcc3 Cleanup code 2023-01-30 19:15:47 +01:00
Alfonso Grillo
60289e85ee Add polls rule ids 2023-01-30 19:15:47 +01:00
Anderas
e8bc82fc06
Merge pull request #7319 from vector-im/andy/import_progress
Display backup import progress
2023-01-30 18:12:51 +00:00
Andy Uhnak
c54546d3b8 Display backup import progress 2023-01-30 15:49:10 +00:00
Nicolas Mauri
85925600bc Hide decryption errors only for voice broadcast chunks. 2023-01-30 16:37:58 +01:00
Flavio Alescio
728dd10afd function renamed as in sdk 2023-01-30 16:04:58 +01:00
Flavio Alescio
c794354386 Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms 2023-01-30 15:55:30 +01:00
aringenbach
166ec54ac2 Labs: Rich text editor: enable list items indentation 2023-01-30 15:38:56 +01:00
Anderas
b741d3526d
Merge pull request #7310 from vector-im/andy/crypto_password
Generate Crypto SDK store key
2023-01-30 11:42:40 +00:00
Flavio Alescio
2b08aa691b added changelog 2023-01-30 10:31:00 +01:00
Flavio Alescio
7e9f44a78f added alert to show possible error, improved tests 2023-01-27 17:10:16 +01:00
Flavio Alescio
d97095e55d function renamed 2023-01-27 15:28:02 +01:00
Flavio Alescio
6330ea4d6c generated String 2023-01-27 15:23:44 +01:00
Flavio Alescio
51841534d7 Merge branch 'develop' into flescio/1040-poll_detail
# Conflicts:
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift
#	RiotSwiftUI/Modules/Room/PollHistory/PollHistoryModels.swift
#	RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
2023-01-27 15:22:15 +01:00
Flavio Alescio
762af03aaf added view in timeline action, added tests 2023-01-27 15:07:32 +01:00
Andy Uhnak
4a2a057a9b Generate crypto store key 2023-01-27 10:20:40 +00:00
Doug
204b9d032f Prepare for new sprint 2023-01-26 17:17:21 +00:00
Doug
78a427238d Merge branch 'master' into develop 2023-01-26 17:17:17 +00:00
Doug
8bc71349f0 Merge branch 'release/1.9.17/master' 2023-01-26 17:17:12 +00:00
Doug
a5ae619412 finish version++ 2023-01-26 17:17:12 +00:00
Doug
68d8386595
Merge pull request #7307 from vector-im/release/1.9.17/release
Release 1.9.17
2023-01-26 17:16:00 +00:00
Doug
99891f3c32 version++ 2023-01-26 16:24:32 +00:00
Alfonso Grillo
87d8aec9e9
Merge pull request #7303 from vector-im/alfogrillo/poll_history_load_more
Poll history: load more polls (PSG-1093)
2023-01-26 17:17:45 +01:00
Doug
487347ac78
Merge pull request #7306 from vector-im/doug/space-switcher
Fix Space Switcher avatars
2023-01-26 16:16:44 +00:00
Alfonso Grillo
fc8ee97c1b Use Calendar to compute target dates 2023-01-26 15:16:48 +01:00
Alfonso Grillo
6caf8d707d Fix alert presentation 2023-01-26 14:52:33 +01:00
Anderas
0e0f9e842b
Merge pull request #7304 from vector-im/andy/tracking_changes
Ensure E2EE never tracks UnknownError
2023-01-26 12:12:29 +00:00
Doug
4f61755b17 Fix avatar loading in SwiftUI. 2023-01-26 11:59:19 +00:00
Andy Uhnak
3e286d1abb Ensure E2EE never tracks UnknownError 2023-01-26 11:23:25 +00:00
Alfonso Grillo
13a317e5eb Add changelog.d file 2023-01-26 10:38:41 +01:00
Alfonso Grillo
0a4b507ffb Improve tests 2023-01-26 10:29:30 +01:00
Alfonso Grillo
f9c570e187 Cleanup unused code 2023-01-26 10:14:26 +01:00
Alfonso Grillo
8138410e1e Improve error handling 2023-01-26 10:09:47 +01:00
Alfonso Grillo
31ca4e3e38 Refine timestamp logics 2023-01-26 10:09:28 +01:00
Alfonso Grillo
ef6910a5f9 Add UTs 2023-01-25 20:16:24 +01:00
Alfonso Grillo
48e80b5e26 Add ui tests 2023-01-25 19:58:02 +01:00
Alfonso Grillo
51f612186a Add more MockPollHistoryScreenState cases 2023-01-25 19:41:48 +01:00
Alfonso Grillo
d51938e544 Improve MockPollHistoryScreenState 2023-01-25 19:21:56 +01:00
Alfonso Grillo
a69c4d24e9 Add alert on error 2023-01-25 18:40:09 +01:00
Alfonso Grillo
ce52d5bf7c Cleanup code 2023-01-25 18:19:48 +01:00
Alfonso Grillo
63ee508e36 Handle live polls 2023-01-25 17:52:39 +01:00
Nicolas Mauri
c0e5697f07 Inform the user about decryption errors during a voice broadcast 2023-01-25 17:23:42 +01:00
Nicolas Mauri
f3b4c09994
Merge pull request #7300 from vector-im/nimau/hotfix_deadlock_update_room_summary
Fix a deadlock when updating the summary of a room that has a voice broadcast
2023-01-25 16:43:33 +01:00