18338 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alfonso Grillo	241a1fcb7f	Fix rebase issues	2023-02-01 11:41:59 +01:00
Alfonso Grillo	832a8bab78	Add changelog.d file	2023-02-01 11:39:59 +01:00
Alfonso Grillo	e9bbc57a6e	Improve UT	2023-02-01 11:39:59 +01:00
Alfonso Grillo	f29867ff17	Add error handling for push sync	2023-02-01 11:38:38 +01:00
Alfonso Grillo	a1f07e2a1e	Cleanup	2023-02-01 11:28:48 +01:00
Alfonso Grillo	6850633a52	Async-await refactor	2023-02-01 10:47:11 +01:00
Alfonso Grillo	8d734b9e40	Merge branch 'develop' into alfogrillo/sync_polls_rules	2023-01-31 19:11:21 +01:00
Anderas	b1a1cb1813	Merge pull request #7323 from vector-im/andy/reset_crypto ... Reset Crypto SDK labs on logout	2023-01-31 16:35:39 +00:00
Andy Uhnak	097658f9f5	Fix develop	2023-01-31 16:29:17 +00:00
Andy Uhnak	ff6fab708e	Reset Crypto SDK on logout	2023-01-31 13:14:47 +00:00
Flescio	54602b63ec	Merge pull request #7301 from vector-im/flescio/7253-Add_mar_kas_unread_option_for_rooms ... Flescio/7253 add mar kas unread option for rooms	2023-01-31 12:37:40 +01:00
Alfonso Grillo	9b314626ad	Empty-Commit	2023-01-31 10:30:25 +01:00
Nicolas Mauri	13698ee8e7	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
Nicolas Mauri	cfe166beb1	Update changelog.	2023-01-31 10:21:18 +01:00
Alfonso Grillo	731b3437b7	Improve tests	2023-01-30 19:15:47 +01:00
Alfonso Grillo	8b39dbc821	Add changelog.d file	2023-01-30 19:15:47 +01:00
Alfonso Grillo	3b9b332b0a	Add UTs	2023-01-30 19:15:47 +01:00
Alfonso Grillo	e0bf70caf5	Add comment	2023-01-30 19:15:47 +01:00
Alfonso Grillo	0306fe0c1c	Add loudest option logic	2023-01-30 19:15:47 +01:00
Alfonso Grillo	dc41b2d52b	Cleanup	2023-01-30 19:15:47 +01:00
Alfonso Grillo	989a4632cb	Add Task to update rules	2023-01-30 19:15:47 +01:00
Alfonso Grillo	839ca6d474	Cleanup	2023-01-30 19:15:47 +01:00
Alfonso Grillo	0247bc96eb	Refine poll push rule sync logic	2023-01-30 19:15:47 +01:00
Alfonso Grillo	99abb01c68	Start poll push rule sync logic	2023-01-30 19:15:47 +01:00
Alfonso Grillo	50bfc5390d	Create private extension of NotificationSettingsViewModel	2023-01-30 19:15:47 +01:00
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
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	d97095e55d	function renamed	2023-01-27 15:28:02 +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