Commit Graph

30 Commits

Author SHA1 Message Date
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 e4501a6644 Add settings service in UserOtherSessionsViewModel 2022-11-03 14:47:09 +01:00
Alfonso Grillo 075a3e2c72 Add location info in UserOtherSessions 2022-11-03 14:47:08 +01:00
Alfonso Grillo c00233538a Add “show location” feature in other sessions list 2022-11-03 14:46:19 +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
paleksandrs b6817a072a Renamed sign out to logout 2022-10-31 14:44:03 +02:00
paleksandrs f49a7d57bd Renamed sign out to logout 2022-10-31 14:36:14 +02:00
Alfonso Grillo 7817581d20 Show bottom sheet in other sessions screen 2022-10-28 15:50:35 +02:00
Alfonso Grillo 06009e52ff Improve UserOtherSessionsUITests 2022-10-28 11:38:09 +02:00
Alfonso Grillo 733e06479a Show bottom sheet in user other sessions 2022-10-28 11:38:09 +02:00
Aleksandrs Proskurins f0c69a6370 Sing out filtering 2022-10-27 17:35:39 +03:00
Aleksandrs Proskurins 9282ff03aa Sing out bottom bar 2022-10-26 16:07:01 +03:00
Aleksandrs Proskurins d3cadb95db Merge branch 'develop' into aleksandrs/6963_multi_session_logout 2022-10-25 10:43:34 +03:00
Aleksandrs Proskurins 03718be4cf Code review fixes 2022-10-25 09:17:58 +03:00
Aleksandrs Proskurins 3bd21f68e2 Sign out menu button 2022-10-25 08:41:05 +03:00
Aleksandrs Proskurins 1e9d1224d7 Select All 2022-10-21 11:49:33 +03:00
Aleksandrs Proskurins c98c22d103 UI fixes 2022-10-20 15:35:46 +03:00
Aleksandrs Proskurins b0d5accc2e Removed sections 2022-10-20 12:07:55 +03:00
Aleksandrs Proskurins 1a0fbad7f2 Session selection state 2022-10-19 17:02:48 +03:00
Aleksandrs Proskurins 8614315c00 Navigating to session overview goes to session details 2022-10-14 09:21:17 +03:00
Aleksandrs Proskurins 2d0a38ae1b Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-10-12 13:11:43 +03:00
Aleksandrs Proskurins c031dbb4de Renamed OtherUserSessionsFilter to UserOtherSessionsFilter 2022-10-12 09:30:41 +03:00
Aleksandrs Proskurins 6225aab76b Clear filter button 2022-10-11 14:54:09 +03:00
Aleksandrs Proskurins 76e2a82948 Filter button 2022-10-11 08:42:28 +03:00
ismailgulek 429a2f83a3 QR login from device manager (#6818)
* Add link device button into the sessions overview screen

* Run Swift format

* Fix tests

* Fix a crash in tests

* Fix PR remark
2022-10-07 12:58:26 +03:00
Aleksandrs Proskurins a2400ff289 Added tests 2022-10-04 16:58:08 +03:00
Aleksandrs Proskurins bba0246c3a Renamed session to sessionInfo 2022-10-04 15:34:31 +03:00
Aleksandrs Proskurins 99574a9d53 Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/Unit/UserSessionOverviewViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
2022-10-04 15:14:59 +03:00
Aleksandrs Proskurins 0cfceb4c5e Cleanup 2022-10-04 09:38:53 +03:00
Aleksandrs Proskurins 20200fd22a User other sessions screen template 2022-10-03 11:27:12 +03:00