Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
17459 commits 46 branches 261 tags 144 MiB
Commit graph

888 commits

Author SHA1 Message Date
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
cd5ce7ea72 Add location feature in UserSessionsOverview 2022-11-03 14:46:19 +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
paleksandrs
f8a9107c2b Sign out of all other sessions 2022-10-31 17:21:53 +02:00
Alfonso Grillo
5504a160d2 Show rename info alert 2022-10-28 11:38:09 +02:00
Alfonso Grillo
0210dccdc6 Add inactive sessions copy 2022-10-28 11:38:09 +02:00
Alfonso Grillo
a28de2b8b8 Localise content 2022-10-28 11:38:09 +02:00
Aleksandrs Proskurins
bfbcc3c066 Sign out menu button 2022-10-25 08:41:05 +03:00
Aleksandrs Proskurins
bff4eeaaf3 Merge branch 'develop' into aleksandrs/6928_multi_session_selection 2022-10-21 14:21:59 +03:00
Aleksandrs Proskurins
d5a3af2d8a Select All 2022-10-21 11:49:33 +03:00
Aleksandrs Proskurins
dcbf750f78 UI fixes 2022-10-20 15:35:46 +03:00
yostyle
43b7c30737 Add voice broadcast error view 2022-10-20 02:36:27 +02:00
Giom Foret
d1ce571ab1 Update the Voice Broadcast Labs flag description 2022-10-20 01:45:57 +02:00
Giom Foret
080acb3628 Display info dialogs when we prevent the user from starting a new voice broadcast 
- Update the existing implementation used to start/stop a voice broadcast in order to handle the different cases where voice broadcast is denied
- Add the optional Voice broadcast action to the new wysiwyg composer
 2022-10-20 00:38:42 +02:00
Yoan Pintas
c8ceb52287
[Voice Broadcast] Aggregate the chunks of voice messages in room timeline (#6891) 2022-10-17 18:23:47 +02:00
Doug
a23f5d7315
Merge pull request #6883 from vector-im/doug/fix-weblate 
Fix merge conflicts from weblate.
 2022-10-14 13:19:25 +01:00
Doug
3bbc5a2238 Merge branch 'develop' of https://translate.element.io/git/riot-ios/riot-ios into doug/fix-weblate 
# Conflicts:
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/id.lproj/Vector.strings
#	Riot/Assets/it.lproj/Vector.strings
#	Riot/Assets/pt_BR.lproj/Vector.strings
#	Riot/Assets/sk.lproj/Vector.strings
#	Riot/Assets/uk.lproj/Vector.strings
 2022-10-14 12:04:31 +01:00
David Langley
597f0950a6
Merge pull request #6875 from vector-im/langleyd/6873_accessibility_labels 
WYSIWYG: Accessibility labels
 2022-10-14 08:49:20 +01:00
David Langley
3335da8b04 Additional translations and accessiblity labels 2022-10-13 17:03:33 +01:00
David Langley
1f5830821c
Merge pull request #6831 from vector-im/langleyd/6830_wysiwyg_core_formatting 
Wysiwyg: Core Formatting
 2022-10-13 16:03:27 +01:00
Aleksandrs Proskurins
bc26fe7e15 Correct label for other verified session 2022-10-13 10:51:58 +03:00
Aleksandrs Proskurins
9e19986df6 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
1fb3056bdf Correct verificationStatusAdditionalInfoText for other session 2022-10-13 09:46:11 +03:00
Doug
3d3ccda296 Update strings for unknown sessions. 2022-10-12 14:42:24 +01:00
Aleksandrs Proskurins
d5d5744b23 Added last activity item to session details screen 2022-10-12 16:21:07 +03:00
David Langley
aa6c3a0041 get rid of additional UIHostingController. Cleanup and comments. 2022-10-12 14:14:25 +01:00
Aleksandrs Proskurins
7a7ed567a4 Added accessibility label to filter menu 2022-10-12 14:34:26 +03:00
David Langley
b6e0340bce 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
7015d12b78
Update Riot/Assets/en.lproj/Vector.strings 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-10-12 13:11:09 +03:00
Aleksandrs Proskurins
5cb2b25eff 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
Doug
313331708d
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
Doug
c358f28a55
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
0af1ac2692 Clear filter button 2022-10-11 14:54:09 +03:00
Aleksandrs Proskurins
168de8bb78 Verified sessions 2022-10-11 09:42:07 +03:00
David Langley
573f27a6f1 Add labs flag and strings 2022-10-08 11:57:13 +01:00
Johannes Marbach
d11691b356
Merge pull request #6828 from vector-im/johannes/default-session-name 
Include app name in default session display name
 2022-10-07 20:40:01 +02:00
Johannes Marbach
e96f6f6412 Include app name in default session display name 2022-10-07 16:54:08 +02:00
Johannes Marbach
4eb7a36447 Remove current app name from device type name 2022-10-07 16:02:14 +02:00
ismailgulek
1ee8c9ca19
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
ismailgulek
19afad1f18
Login with QR UI components (#6790) 
* Display QR button on login screen if HS supports

* Create start screen

* Add build flag

* Connect start screen to the login

* QR display screen

* Move `LabelledDividerView` into separate file

* Show display QR screen on button tap

* Add swift concurreny to CameraAccessManager

* Introduce `QRLoginServiceProtocol`

* Use new service in screens

* Introduce scan QR code screen

* Remove hardcoded service availability

* Remove unnecessary import

* Add confirmation screen

* Add loading screen

* Fix ZXingObjc targets

* Add failure screen

* Add strings

* Various UI tweaks, navigation according to the service state

* Fix tests

* Add string for invalid QR error

* Add QR login service mode
 2022-10-06 18:05:46 +03:00
Aleksandrs Proskurins
4fa1398a74 Merge branch 'develop' into aleksandrs/6801_unverified_sessions_screen 2022-10-06 10:49:48 +03:00
Doug
bb07a11e7e Session Manager: Single session logout 2022-10-05 16:48:51 +01:00
Aleksandrs Proskurins
dd8d27bcac Unverified sessions screen 2022-10-05 16:22:52 +03:00
Aleksandrs Proskurins
7e09a6ece5 Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen 
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserSessionDetails/UserSessionDetailsViewModel.swift
 2022-10-05 11:51:08 +03:00
Aleksandrs Proskurins
3deee90005 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
Doug
2c33defeeb Remove duplicate strings. 2022-10-04 12:22:49 +01:00
ismailgulek
dadbeca766
Include browser version in parsed user agent (PSG-761) (#6788) 
* Update UserSessionInfo structure to include client version

* Add string for browser

* Update user agent parser to parse browser version too

* Add browser row into the session details

* Add changelog

* Fix tests

* Run Swift format
 2022-10-04 10:49:26 +03:00
Aleksandrs Proskurins
ca3a401b18 Added translation strings, cleanup 2022-10-04 10:07:04 +03:00
Gil Eluard
01dc333770 Merge branch 'develop' into gil/6787-Add_support_for_MSC3881 2022-10-03 14:09:17 +02:00