 aringenbach
|
8a894d7e49
|
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
|
93a762e253
|
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
|
040e71842a
|
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
|
3028289a47
|
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
|
4f445b8f70
|
Rich-text editor: enable translations between Markdown and HTML when toggling text formatting
|
2022-11-09 16:43:58 +01:00 |
|
|
aringenbach
|
d0aa621dad
|
Fix composer view model tests
|
2022-11-09 15:23:43 +01:00 |
|
 Alfonso Grillo
|
24587ed478
|
Add intrinsic sized bottom sheet
|
2022-11-09 12:05:47 +01:00 |
|
|
aringenbach
|
1874ae8f79
|
Re-order View computed properties and move to private mark
|
2022-11-09 11:49:03 +01:00 |
|
|
aringenbach
|
4eb168b41b
|
Labs: Rich-text editor - Fix text formatting switch losing the current content of the composer
|
2022-11-09 11:41:42 +01:00 |
|
|
aringenbach
|
15c1a9cf89
|
Rich-text editor: Fix text formatting enabled inconsistent state
|
2022-11-09 10:26:48 +01:00 |
|
|
Alfonso Grillo
|
6d5bc35ce4
|
Refine bottom sheet layout
|
2022-11-08 18:04:42 +01:00 |
|
|
Alfonso Grillo
|
671dfa660d
|
Merge branch 'develop' into alfogrillo/learn_more_sheet
|
2022-11-08 17:04:20 +01:00 |
|
|
aringenbach
|
476f5f6ab6
|
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
|
56b244f066
|
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
|
221f4ad106
|
Device Manager: Session list item is not tappable everywhere
|
2022-11-04 15:50:37 +02:00 |
|
|
Alfonso Grillo
|
e20ebe56db
|
Amend title font
|
2022-11-04 11:06:01 +01:00 |
|
|
Alfonso Grillo
|
e2a073c655
|
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
|
a868165173
|
Merge branch 'develop' into alfogrillo/learn_more_sheet
|
2022-11-03 17:29:01 +01:00 |
|
|
Alfonso Grillo
|
3229ff0777
|
Fix failing test
|
2022-11-03 15:30:13 +01:00 |
|
|
Alfonso Grillo
|
caaa1c69a4
|
Add animations
|
2022-11-03 14:55:33 +01:00 |
|
|
Alfonso Grillo
|
2fd362b6ab
|
Cleanup merge leftovers
|
2022-11-03 14:50:46 +01:00 |
|
|
Alfonso Grillo
|
da81e29a00
|
Fix UTs
|
2022-11-03 14:47:09 +01:00 |
|
|
Alfonso Grillo
|
7713c7d9ec
|
Inject setting service in UserSessionOverviewViewModel
|
2022-11-03 14:47:09 +01:00 |
|
|
Alfonso Grillo
|
e4501a6644
|
Add settings service in UserOtherSessionsViewModel
|
2022-11-03 14:47:09 +01:00 |
|
|
Alfonso Grillo
|
28b147199c
|
Mock settings in UserSessionsOverviewViewModel
|
2022-11-03 14:47:09 +01:00 |
|
|
Alfonso Grillo
|
b847714200
|
Refine settings logic
|
2022-11-03 14:47:08 +01:00 |
|
|
Alfonso Grillo
|
075a3e2c72
|
Add location info in UserOtherSessions
|
2022-11-03 14:47:08 +01:00 |
|
|
Alfonso Grillo
|
39128bf281
|
Add show/hide ip persistency
|
2022-11-03 14:47:08 +01:00 |
|
|
Alfonso Grillo
|
d62f11a655
|
Cleanup
|
2022-11-03 14:47:08 +01:00 |
|
|
Alfonso Grillo
|
1d56880bf7
|
Cleanup code
|
2022-11-03 14:47:08 +01:00 |
|
|
Alfonso Grillo
|
870d6d214c
|
Cleanup merge leftovers
|
2022-11-03 14:47:08 +01:00 |
|
|
Alfonso Grillo
|
6ee539d3cc
|
Add “show location“ feature in session overview
|
2022-11-03 14:46:19 +01:00 |
|
|
Alfonso Grillo
|
c00233538a
|
Add “show location” feature in other sessions list
|
2022-11-03 14:46:19 +01:00 |
|
|
Alfonso Grillo
|
fcc18d23d1
|
Add location feature in UserSessionsOverview
|
2022-11-03 14:46:19 +01:00 |
|
|
Alfonso Grillo
|
9c63050fb3
|
Map location info
|
2022-11-03 14:46:19 +01:00 |
|
|
Aleksandrs Proskurins
|
ec8ef15843
|
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
|
3c98c49cb0
|
Code review fixes
|
2022-11-03 13:38:23 +02:00 |
|
|
paleksandrs
|
246e1920ed
|
Code review fixes, created DestructiveButton
|
2022-11-03 10:49:02 +02:00 |
|
|
Alfonso Grillo
|
7120d9ab0c
|
Cleanup
|
2022-11-03 09:40:00 +01:00 |
|
|
Alfonso Grillo
|
caf81e85b5
|
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
|
e6f97158e9
|
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
|
cd7a77ae2a
|
fix for 6946
|
2022-11-02 16:45:40 +01:00 |
|
|
aringenbach
|
d7e5307f0b
|
Synchronise composer and toolbar resizing animation duration
|
2022-11-02 16:40:57 +01:00 |
|
|
paleksandrs
|
d30d8a0938
|
Merge branch 'develop' into aleksandrs/7014_sign_out_of_other_sessions
|
2022-11-02 15:07:17 +02:00 |
|
|
Aleksandrs Proskurins
|
4eeffa8cf1
|
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
|
786749f97c
|
Code review fixes
|
2022-11-02 14:09:26 +02:00 |
|
|
Velin92
|
b63305b6dc
|
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
|
5084e0f54e
|
Merge branch 'develop' into aleksandrs/6963_multi_session_logout
|
2022-11-02 14:02:52 +02:00 |
|
|
paleksandrs
|
ffc4171559
|
Hide push toggles for http pushers when there is no server support
|
2022-11-02 13:36:58 +02:00 |
|
|
Mauro Romito
|
7faa041b59
|
test may fail on CI
|
2022-11-02 11:58:55 +01:00 |
|