Commit Graph

1283 Commits

Author SHA1 Message Date
Aleksandrs Proskurins 6f9be0d334 Correct label for other verified session 2022-10-13 10:51:58 +03:00
Aleksandrs Proskurins f7e8bc2d9e Merge branch 'develop' into aleksandrs/6864_fixes_from_testing
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift
2022-10-13 10:42:53 +03:00
Aleksandrs Proskurins e081e50d09 Correct verificationStatusAdditionalInfoText for other session 2022-10-13 09:46:11 +03:00
Mauro Romito f382f4e1fb ui test improvements 2022-10-13 03:10:25 +02:00
Mauro Romito c1d06f2150 ui tests fix on ci 2022-10-13 02:28:56 +02:00
Mauro Romito 9796039e9a ui test should work now 2022-10-13 02:16:02 +02:00
Mauro Romito f79ce9b50a ui tests should now work on CI 2022-10-13 01:27:14 +02:00
Mauro Romito 1bbacb2c19 code improvement 2022-10-13 00:23:30 +02:00
Mauro Romito 02085e7bc4 code improvement 2022-10-13 00:21:03 +02:00
Mauro Romito 1bf8a9952d Tests completed! The only doubt I have left is about testing the string content considering the localisations in tests 2022-10-12 20:06:15 +02:00
Mauro Romito 2b649f58d8 unit tests 2022-10-12 18:39:10 +02:00
Mauro Romito b6334dcbd5 improving code 2022-10-12 16:55:35 +02:00
Mauro Romito 44ec5e8a68 composer code improvement 2022-10-12 16:52:12 +02:00
Mauro Romito c41342f592 Merge branch 'langleyd/6830_wysiwyg_core_formatting' into mauroromito/wysiwyg_edit_reply_UI
# Conflicts:
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
2022-10-12 16:48:43 +02:00
Stefan Ceriu efd258ce67 Fix UI tests for features currently disabled 2022-10-12 17:27:25 +03:00
Stefan Ceriu 3433e26e8c Remove now unnecessary creator public key publishing. Rebuilt flows and fixed tests 2022-10-12 17:27:25 +03:00
Hugh Nimmo-Smith a7f433fcee Remove extra step as no longer required 2022-10-12 17:27:25 +03:00
Stefan Ceriu 76ea89eede Fix initiator flows and e2e tests 2022-10-12 17:27:25 +03:00
Stefan Ceriu 3f90ef3da2 Implement login with scanned QR code flows 2022-10-12 17:27:25 +03:00
Aleksandrs Proskurins 93f7f22133 Remove verify session button for other sessions when the current session is unverified 2022-10-12 17:22:10 +03:00
David Langley 4cbef854c9 wiftlint 2022-10-12 15:08:50 +01:00
Doug 7697724adc Update strings for unknown sessions. 2022-10-12 14:42:24 +01:00
David Langley 821a54e726 More comments 2022-10-12 14:32:48 +01:00
Mauro Romito e591ea13b3 Merge branch 'langleyd/6830_wysiwyg_core_formatting' into mauroromito/wysiwyg_edit_reply_UI
# Conflicts:
#	Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
2022-10-12 15:25:27 +02:00
Aleksandrs Proskurins 1fb76d50b6 Added last activity item to session details screen 2022-10-12 16:21:07 +03:00
Mauro Romito 1571afd621 legacy sendMode code separation to have RiotSwiftUI be able to build. 2022-10-12 15:14:41 +02:00
David Langley 89c643734c get rid of additional UIHostingController. Cleanup and comments. 2022-10-12 14:14:25 +01:00
Aleksandrs Proskurins 0d96dae610 Merge pull request #6860 from vector-im/aleksandrs/6838_filter_sessions
Device Manager: Filter sessions
2022-10-12 15:27:42 +03:00
Mauro Romito fe5669690b should now be aligned to the designs 2022-10-12 14:26:38 +02:00
Mauro Romito f9b38260cb pr comment + some design improvements 2022-10-12 13:58:44 +02:00
Aleksandrs Proskurins d44782ff3b Added accessibility label to filter menu 2022-10-12 14:34:26 +03:00
David Langley ae4293f6c6 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/6830_wysiwyg_core_formatting 2022-10-12 11:46:24 +01:00
Aleksandrs Proskurins c61b45e75d Renamed filerWasChanged to filterWasChanged 2022-10-12 13:18:33 +03:00
Aleksandrs Proskurins 4f64077c2e 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
Mauro Romito 08759a743b some UI tweaks 2022-10-12 11:06:01 +02:00
Aleksandrs Proskurins 3e8dcab969 Formating 2022-10-12 11:00:38 +03:00
Aleksandrs Proskurins 20be525f16 Merge branch 'develop' into aleksandrs/6838_filter_sessions
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
2022-10-12 10:58:04 +03:00
Aleksandrs Proskurins 401e35f4d6 Renamed OtherUserSessionsFilter to UserOtherSessionsFilter 2022-10-12 09:30:41 +03:00
Mauro Romito 113ef5dcfe edit reply completed, just need to polish the UI a bit more. 2022-10-11 21:04:04 +02:00
Mauro Romito 516ab24c37 color improvements and implementing the cancel callback 2022-10-11 19:58:22 +02:00
Mauro Romito 9a7900fe3a right assets 2022-10-11 17:54:27 +02:00
Mauro Romito 47653e2d8a edit mode changes the send button 2022-10-11 17:25:58 +02:00
Alfonso Grillo 16f7a0672f Move completions around 2022-10-11 17:18:05 +02:00
Alfonso Grillo b77e568dd1 Remove loader for live location sharing 2022-10-11 17:15:10 +02:00
Alfonso Grillo c6b2a0a7ef Remove loader for static location sharing 2022-10-11 17:15:10 +02:00
Doug 3279f58ec4 Device Manager: Verify session (#6832)
* Initial implementation
* Add verificationState to UserSessionInfo
* Listen for changes device changes in the service.
2022-10-11 16:11:52 +01:00
Aleksandrs Proskurins b7b3e18778 UI and unit tests 2022-10-11 17:19:32 +03:00
Doug efaf98fe6a Device Manager: Rename Session (#6826)
* Publish the user sessions overview data.
* Add UserSessionName screen.
* Update logout action to match Figma more closely.
2022-10-11 13:11:15 +01:00
Aleksandrs Proskurins c3b4630e76 Clear filter button 2022-10-11 14:54:09 +03:00
ismailgulek 969c51db1e Ignore OS version from web based sessions (PSG-826) (#6852)
* Ignore OS version from web based sessions

* Add changelog
2022-10-11 14:39:36 +03:00