Commit graph

966 commits

Author SHA1 Message Date
Alfonso Grillo
070404a4f4 Improve UserSessionNameViewModelTests 2022-11-10 10:57:14 +01:00
Alfonso Grillo
1e7e70868e Cleanup tests 2022-11-10 10:35:10 +01:00
Alfonso Grillo
48740ba2ec Improve UserSessionNameUITests 2022-11-10 10:31:32 +01:00
Alfonso Grillo
7ec2644dfe Add UserSessionDetailsUITests 2022-11-10 10:31:32 +01:00
Alfonso Grillo
47310b1a73 Move Move UserAgentParserTests 2022-11-10 10:31:32 +01:00
aringenbach
3329bae7bf
Merge pull request #7062 from vector-im/aringenbach/7061_enable_markdown
Rich-text editor: enable translations between Markdown and HTML when toggling text formatting
2022-11-10 10:25:43 +01:00
aringenbach
c7824e28ad
Merge pull request #7055 from vector-im/aringenbach/7054_fix_lost_content_text_formatting_switch
Labs: Rich-text editor - Fix text formatting switch losing the current content of the composer
2022-11-10 10:25:26 +01:00
aringenbach
bfd573553c
Merge pull request #7060 from vector-im/aringenbach/fix_composer_view_model_tests
Fix composer view model tests
2022-11-10 10:16:36 +01:00
Alfonso Grillo
5b334906d2
Merge pull request #6992 from vector-im/alfogrillo/learn_more_sheet
Add informational sheet for sessions (PSG-714)
2022-11-09 17:49:15 +01:00
aringenbach
b76edecb65 Rich-text editor: enable translations between Markdown and HTML when toggling text formatting 2022-11-09 16:43:58 +01:00
aringenbach
487724df6f Fix composer view model tests 2022-11-09 15:23:43 +01:00
Alfonso Grillo
794a071ac0 Add intrinsic sized bottom sheet 2022-11-09 12:05:47 +01:00
aringenbach
46c3dc4417 Re-order View computed properties and move to private mark 2022-11-09 11:49:03 +01:00
aringenbach
41b23e1c85 Labs: Rich-text editor - Fix text formatting switch losing the current content of the composer 2022-11-09 11:41:42 +01:00
aringenbach
f611351e70 Rich-text editor: Fix text formatting enabled inconsistent state 2022-11-09 10:26:48 +01:00
Alfonso Grillo
ab00c7e400 Refine bottom sheet layout 2022-11-08 18:04:42 +01:00
Alfonso Grillo
d5c3bd2e48 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-08 17:04:20 +01:00
aringenbach
37355b0976 Merge branch 'develop' into resilience-rc
# Conflicts:
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
#	project.yml
2022-11-07 15:05:25 +01:00
Aleksandrs Proskurins
475e887463
Merge pull request #7023 from vector-im/aleksandrs/7022_hide_push
Hide push toggles for http pushers when there is no server support
2022-11-07 15:24:25 +02:00
paleksandrs
e6367cba4c Device Manager: Session list item is not tappable everywhere 2022-11-04 15:50:37 +02:00
Alfonso Grillo
5b7343853b Amend title font 2022-11-04 11:06:01 +01:00
Alfonso Grillo
455118d22b Merge branch 'develop' into alfogrillo/learn_more_sheet
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift
2022-11-03 18:25:06 +01:00
Alfonso Grillo
09e9f3e176 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-03 17:29:01 +01:00
Alfonso Grillo
3678a522db Fix failing test 2022-11-03 15:30:13 +01:00
Alfonso Grillo
4a98acda3c Add animations 2022-11-03 14:55:33 +01:00
Alfonso Grillo
164e1d103d Cleanup merge leftovers 2022-11-03 14:50:46 +01:00
Alfonso Grillo
110dfbc2ba Fix UTs 2022-11-03 14:47:09 +01:00
Alfonso Grillo
5e143ed0ef Inject setting service in UserSessionOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo
765a3590a2 Add settings service in UserOtherSessionsViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo
18e9783a64 Mock settings in UserSessionsOverviewViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo
1221b0f874 Refine settings logic 2022-11-03 14:47:08 +01:00
Alfonso Grillo
c7ee0b2deb Add location info in UserOtherSessions 2022-11-03 14:47:08 +01:00
Alfonso Grillo
01b6b12752 Add show/hide ip persistency 2022-11-03 14:47:08 +01:00
Alfonso Grillo
70a03ec0cd Cleanup 2022-11-03 14:47:08 +01:00
Alfonso Grillo
fec6c33bef Cleanup code 2022-11-03 14:47:08 +01:00
Alfonso Grillo
7934403d92 Cleanup merge leftovers 2022-11-03 14:47:08 +01:00
Alfonso Grillo
1c5ff99d2c Add “show location“ feature in session overview 2022-11-03 14:46:19 +01:00
Alfonso Grillo
bae2856418 Add “show location” feature in other sessions list 2022-11-03 14:46:19 +01:00
Alfonso Grillo
cd5ce7ea72 Add location feature in UserSessionsOverview 2022-11-03 14:46:19 +01:00
Alfonso Grillo
aa9a4cd752 Map location info 2022-11-03 14:46:19 +01:00
Aleksandrs Proskurins
848a6db0ec
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
4639782521 Code review fixes 2022-11-03 13:38:23 +02:00
paleksandrs
0bc0011ebe Code review fixes, created DestructiveButton 2022-11-03 10:49:02 +02:00
Alfonso Grillo
d0056edd7a Cleanup 2022-11-03 09:40:00 +01:00
Alfonso Grillo
24ed60c2e8 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
70ae9d6e03
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
d42828d741 fix for 6946 2022-11-02 16:45:40 +01:00
aringenbach
514ec10450 Synchronise composer and toolbar resizing animation duration 2022-11-02 16:40:57 +01:00
paleksandrs
bf7deaf582 Merge branch 'develop' into aleksandrs/7014_sign_out_of_other_sessions 2022-11-02 15:07:17 +02:00
Aleksandrs Proskurins
b99a33b42c
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