Commit Graph

775 Commits

Author SHA1 Message Date
David Langley 712a9bee13 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/5017_uisi_autoreporter 2022-03-16 21:45:33 +00:00
Arnaud Ringenbach ccd118393c Remove KeyPreSharingStrategy support 2022-03-16 14:17:46 +01:00
Arnaud Ringenbach dc16d3a5f7 Remove KeyPreSharingStrategy support 2022-03-16 14:17:46 +01:00
Gil Eluard 67b0df922f Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
Gil Eluard c747ff86ac Add trigger to join and view room metrics events #5769
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
David Langley ae320d1efa Add AutoReported, re-work big client interface and hook up AutoReporter. 2022-03-11 16:47:08 +00:00
David Langley 477dc34a50 Add AutoReported, re-work big client interface and hook up AutoReporter. 2022-03-11 16:47:08 +00:00
Arnaud Ringenbach 5ab06d9f18 Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup
# Conflicts:
#	Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewModel.swift
2022-03-10 10:35:20 +01:00
Arnaud Ringenbach 3d48469e64 Merge branch 'develop' into aringenbach/5745_mandatory_secure_backup
# Conflicts:
#	Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewModel.swift
2022-03-10 10:35:20 +01:00
Gil Eluard cab04809c5 Merge pull request #5748 from vector-im/gil/SP1_space_creation
Creating & managing Spaces
2022-03-10 10:18:48 +01:00
Gil Eluard 7097a505cd Merge pull request #5748 from vector-im/gil/SP1_space_creation
Creating & managing Spaces
2022-03-10 10:18:48 +01:00
Arnaud Ringenbach 8f7fc981cc Display mandatory secure backup setup if needed (first login / migration) 2022-03-09 11:45:18 +01:00
Arnaud Ringenbach 9b414eb5fa Display mandatory secure backup setup if needed (first login / migration) 2022-03-09 11:45:18 +01:00
Arnaud Ringenbach 439743f9ff Force non-cancellable session verification when needed (account migration / interrupted authentication) 2022-03-09 11:45:03 +01:00
Arnaud Ringenbach 61ec6a5a99 Force non-cancellable session verification when needed (account migration / interrupted authentication) 2022-03-09 11:45:03 +01:00
Arnaud Ringenbach 25660bdace Set keyPreSharingStrategy on handleAppState 2022-03-09 10:41:06 +01:00
Arnaud Ringenbach e66395fb59 Set keyPreSharingStrategy on handleAppState 2022-03-09 10:41:06 +01:00
ismailgulek 49683e11d3 Open & reply to thread only if threads enabled 2022-03-08 17:09:29 +03:00
ismailgulek b63ccddc45 Open & reply to thread only if threads enabled 2022-03-08 17:09:29 +03:00
ismailgulek 26b8afeace Navigate to thread from notification 2022-03-08 12:58:13 +03:00
ismailgulek 067c42c67b Navigate to thread from notification 2022-03-08 12:58:13 +03:00
Gil Eluard 42b4144323 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Gil Eluard 59038e18c1 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Doug c9cc59d006 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Doug 86c2b4ebb5 Remove MatrixKitL10n from SwiftGen
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
Anderas fda6ba2862 Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
Anderas 7c3a86c24d Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard 72e280652a Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Doug 109b97284e Merge branch 'master' into develop 2022-02-25 11:40:10 +00:00
Doug 11aee123da Merge branch 'master' into develop 2022-02-25 11:40:10 +00:00
Andy Uhnak 4617b3ed69 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Andy Uhnak 559bb88ae4 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Anderas c9ef4ac58b Merge pull request #5630 from vector-im/andy/5605_leave_room
Update activity indicators on leaving room
2022-02-25 09:52:03 +00:00
Anderas a5f3987bd1 Merge pull request #5630 from vector-im/andy/5605_leave_room
Update activity indicators on leaving room
2022-02-25 09:52:03 +00:00
aringenbach 4c3ab2d296 Fix L10n not always defaulting to English (#5682)
Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-23 15:23:02 +01:00
aringenbach d164527499 Fix L10n not always defaulting to English (#5682)
Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-23 15:23:02 +01:00
Andy Uhnak 5bb32d4971 Rename Activity to UserIndicator 2022-02-22 16:14:03 +00:00
Andy Uhnak 712d64204c Rename Activity to UserIndicator 2022-02-22 16:14:03 +00:00
Gil Eluard 079d50e733 Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Podfile.lock
2022-02-21 17:57:58 +01:00
Gil Eluard f9b008e684 Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Podfile.lock
2022-02-21 17:57:58 +01:00
Andy Uhnak a5ae727f84 Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Andy Uhnak 9eae7c02bb Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Doug 2256b522ab Move presentation of the loading spinner into AuthenticationCoordinator for new users.
Also moves key verification out of a bridge presenter in AuthenticationVC and into the AuthenticationCoordinator.
2022-02-17 17:31:43 +00:00
Doug e167f9c61a Move presentation of the loading spinner into AuthenticationCoordinator for new users.
Also moves key verification out of a bridge presenter in AuthenticationVC and into the AuthenticationCoordinator.
2022-02-17 17:31:43 +00:00
Andy Uhnak 0efa7d463a Move import 2022-02-16 11:56:33 +00:00
Andy Uhnak a6b5564c65 Move import 2022-02-16 11:56:33 +00:00
Andy Uhnak 4d86245033 Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
Andy Uhnak b0ee449c5d Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
Andy Uhnak b9b2c642e3 Add new loading indicators 2022-02-14 16:51:02 +00:00