Commit Graph

1294 Commits

Author SHA1 Message Date
Alfonso Grillo b4d5c3b904 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-03 17:29:01 +01:00
Alfonso Grillo d5d2508eb1 Fix failing test 2022-11-03 15:30:13 +01:00
Alfonso Grillo 0d2b7a85da Add animations 2022-11-03 14:55:33 +01:00
Alfonso Grillo 7c8038ef36 Cleanup merge leftovers 2022-11-03 14:50:46 +01:00
Alfonso Grillo b471d81147 Fix UTs 2022-11-03 14:47:09 +01:00
Alfonso Grillo 4f2cf3d6d7 Inject setting service in UserSessionOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo 2af87e91e2 Add settings service in UserOtherSessionsViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo 6eb67dbdd0 Mock settings in UserSessionsOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo fcbd780370 Refine settings logic 2022-11-03 14:47:08 +01:00
Alfonso Grillo d688600156 Add location info in UserOtherSessions 2022-11-03 14:47:08 +01:00
Alfonso Grillo e6e7e7c5d4 Add show/hide ip persistency 2022-11-03 14:47:08 +01:00
Alfonso Grillo 2045dfdaa0 Cleanup 2022-11-03 14:47:08 +01:00
Alfonso Grillo d7f8aefdb0 Cleanup code 2022-11-03 14:47:08 +01:00
Alfonso Grillo 68e02935d7 Cleanup merge leftovers 2022-11-03 14:47:08 +01:00
Alfonso Grillo f787043129 Add “show location“ feature in session overview 2022-11-03 14:46:19 +01:00
Alfonso Grillo ea50296b10 Add “show location” feature in other sessions list 2022-11-03 14:46:19 +01:00
Alfonso Grillo 3488cc508d Add location feature in UserSessionsOverview 2022-11-03 14:46:19 +01:00
Alfonso Grillo 8a5c5a7e07 Map location info 2022-11-03 14:46:19 +01:00
Aleksandrs Proskurins 3141c39cab Merge pull request #7015 from vector-im/aleksandrs/7014_sign_out_of_other_sessions
Device Manager: Sign out of other sessions.
2022-11-03 14:32:11 +02:00
paleksandrs 2ed307bf1f Code review fixes 2022-11-03 13:38:23 +02:00
paleksandrs 246e2b01c7 Code review fixes, created DestructiveButton 2022-11-03 10:49:02 +02:00
Alfonso Grillo 74fb22f1e8 Cleanup 2022-11-03 09:40:00 +01:00
Alfonso Grillo 1405ea0940 Merge branch 'develop' into alfogrillo/learn_more_sheet
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Coordinator/UserOtherSessionsCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/View/UserOtherSessions.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/UI/UserSessionOverviewUITests.swift
2022-11-03 09:22:47 +01:00
Velin92 a31ea9c8b9 Merge pull request #7027 from vector-im/mauroromito/6946_custom_emojis
Labs: Rich text-editor fix for "does not support inserting custom iOS emojis"
2022-11-02 17:31:19 +01:00
Mauro Romito e97a4a81fb fix for 6946 2022-11-02 16:45:40 +01:00
aringenbach 32f9d15635 Synchronise composer and toolbar resizing animation duration 2022-11-02 16:40:57 +01:00
paleksandrs a5c4410d52 Merge branch 'develop' into aleksandrs/7014_sign_out_of_other_sessions 2022-11-02 15:07:17 +02:00
Aleksandrs Proskurins bf767b1362 Merge pull request #6998 from vector-im/aleksandrs/6963_multi_session_logout
Device Manager: Multi session sign out.
2022-11-02 15:05:34 +02:00
paleksandrs 7c89480d6b Code review fixes 2022-11-02 14:09:26 +02:00
Velin92 07803ff919 Merge pull request #7007 from vector-im/mauroromito/7005_fix_missing_keystrokes
Rich Text Composer: Fixing missing keystrokes + fixing long press backspace not deleting all the text
2022-11-02 13:03:12 +01:00
paleksandrs e8e349aa67 Merge branch 'develop' into aleksandrs/6963_multi_session_logout 2022-11-02 14:02:52 +02:00
paleksandrs 338da551ef Hide push toggles for http pushers when there is no server support 2022-11-02 13:36:58 +02:00
Mauro Romito 38de55c1ab test may fail on CI 2022-11-02 11:58:55 +01:00
Mauro Romito f752ac1b50 test improvement 2022-11-02 11:58:19 +01:00
Mauro Romito a8d06b98cd tests may fail on CI 2022-11-02 11:57:16 +01:00
Alfonso Grillo 1febddc6a4 Merge pull request #7001 from vector-im/alfogrillo/improve_kebab_menu
Improve kebab menu in session overview (PSG-832)
2022-11-02 11:35:36 +01:00
Mauro Romito 2f7add90d1 the test may fail on CI without blocking the task/check 2022-11-02 11:23:19 +01:00
Aleksandrs Proskurins 1897d92a67 Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
Co-authored-by: aringenbach <80891108+aringenbach@users.noreply.github.com>
2022-11-02 11:43:03 +02:00
Aleksandrs Proskurins a95621bec3 Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
Co-authored-by: aringenbach <80891108+aringenbach@users.noreply.github.com>
2022-11-02 11:42:55 +02:00
Anderas 821323db4c Merge pull request #6985 from vector-im/andy/complete_crypto
Complete MXCryptoV2 implementation
2022-10-31 17:56:05 +00:00
paleksandrs 2025a46a3b Sign out of all other sessions 2022-10-31 17:21:53 +02:00
paleksandrs 1fa2ab1604 Renamed sign out to logout 2022-10-31 14:44:03 +02:00
paleksandrs 69ccba2bc0 Renamed sign out to logout 2022-10-31 14:36:14 +02:00
paleksandrs 6ba50d3225 Renamed sign out to logout 2022-10-31 14:26:22 +02:00
Giom Foret 9c0dae622a Voice broadcast - Disable the sleep mode during the recording until we are able to handle it
Currently go to "sleep mode" pauses the voice broadcast recording
2022-10-31 11:42:51 +01:00
paleksandrs 0d94c5129c Merge branch 'develop' into aleksandrs/6963_multi_session_logout 2022-10-31 11:30:12 +02:00
Mauro Romito dfae4cbd8d removing a test that can't pass on the CI due to its speed 2022-10-28 19:27:25 +02:00
Mauro Romito 7503030c5b test improvements 2022-10-28 17:42:36 +02:00
Mauro Romito 90d38001c6 tests updated for the CI 2022-10-28 17:41:38 +02:00
Mauro Romito 2629d978f8 improving tests for the CI 2022-10-28 17:08:30 +02:00