Commit Graph

963 Commits

Author SHA1 Message Date
paleksandrs a9437a3641 Removed init 2022-11-14 10:48:15 +02:00
paleksandrs d7e2f7a202 Poll not usable after logging out and back in 2022-11-14 10:43:31 +02:00
aringenbach 7bbfcf530d 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 74813f1352 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 ce578e5ceb 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 dbd4922537 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 8c54a918ff Rich-text editor: enable translations between Markdown and HTML when toggling text formatting 2022-11-09 16:43:58 +01:00
aringenbach 4200d5ca84 Fix composer view model tests 2022-11-09 15:23:43 +01:00
Alfonso Grillo 1538a3b6ac Add intrinsic sized bottom sheet 2022-11-09 12:05:47 +01:00
aringenbach e84b59bd1b Re-order View computed properties and move to private mark 2022-11-09 11:49:03 +01:00
aringenbach 09a2fd11dd Labs: Rich-text editor - Fix text formatting switch losing the current content of the composer 2022-11-09 11:41:42 +01:00
aringenbach 2714792cc6 Rich-text editor: Fix text formatting enabled inconsistent state 2022-11-09 10:26:48 +01:00
Alfonso Grillo f0027faba3 Refine bottom sheet layout 2022-11-08 18:04:42 +01:00
Alfonso Grillo be61cf8b12 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-08 17:04:20 +01:00
aringenbach b7bf6353d0 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 775784150e 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 e6efe4eb39 Device Manager: Session list item is not tappable everywhere 2022-11-04 15:50:37 +02:00
Alfonso Grillo 95dd437ad4 Amend title font 2022-11-04 11:06:01 +01:00
Alfonso Grillo 092fe9ef59 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 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