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 |
|
paleksandrs
|
96f5f862e2
|
Code review fixes
|
2022-11-02 14:09:26 +02:00 |
|
Velin92
|
c7f23f8a40
|
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
|
484cab4451
|
Merge branch 'develop' into aleksandrs/6963_multi_session_logout
|
2022-11-02 14:02:52 +02:00 |
|
Mauro Romito
|
f1c784eed8
|
test may fail on CI
|
2022-11-02 11:58:55 +01:00 |
|
Mauro Romito
|
f63090da03
|
test improvement
|
2022-11-02 11:58:19 +01:00 |
|
Mauro Romito
|
bfcf5206f0
|
tests may fail on CI
|
2022-11-02 11:57:16 +01:00 |
|
Alfonso Grillo
|
171a8ddebd
|
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
|
85a4dbdc85
|
the test may fail on CI without blocking the task/check
|
2022-11-02 11:23:19 +01:00 |
|
Aleksandrs Proskurins
|
fee2d06f79
|
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
|
5b99d7f339
|
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
|
5450a68576
|
Merge pull request #6985 from vector-im/andy/complete_crypto
Complete MXCryptoV2 implementation
|
2022-10-31 17:56:05 +00:00 |
|
paleksandrs
|
f8a9107c2b
|
Sign out of all other sessions
|
2022-10-31 17:21:53 +02:00 |
|
paleksandrs
|
4e79da8f5f
|
Renamed sign out to logout
|
2022-10-31 14:44:03 +02:00 |
|
paleksandrs
|
dc5652217e
|
Renamed sign out to logout
|
2022-10-31 14:36:14 +02:00 |
|
paleksandrs
|
1b559eea74
|
Renamed sign out to logout
|
2022-10-31 14:26:22 +02:00 |
|
paleksandrs
|
c02f144314
|
Merge branch 'develop' into aleksandrs/6963_multi_session_logout
|
2022-10-31 11:30:12 +02:00 |
|
Mauro Romito
|
b0adf3c496
|
removing a test that can't pass on the CI due to its speed
|
2022-10-28 19:27:25 +02:00 |
|
Mauro Romito
|
26cfa3493b
|
test improvements
|
2022-10-28 17:42:36 +02:00 |
|
Mauro Romito
|
8a93711581
|
tests updated for the CI
|
2022-10-28 17:41:38 +02:00 |
|
Mauro Romito
|
1c92373e75
|
improving tests for the CI
|
2022-10-28 17:08:30 +02:00 |
|
Alfonso Grillo
|
3b8e8d12a7
|
Cleanup UI tests
|
2022-10-28 17:00:30 +02:00 |
|