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

4474 commits

Author SHA1 Message Date
ismailgulek
376e5b306c
Merge branch 'develop' into element_3679 2020-10-01 19:06:33 +03:00
ismailgulek
891148d98f
Merge pull request #3709 from vector-im/handle_retry_on_biometrics 
Handle Retry on Biometrics
 2020-10-01 19:06:03 +03:00
manuroe
0c036e4cc2 MXSession: Make sure vc_canSetupSecureBackup is reusable 
Put specific additional check out of this method
 2020-10-01 16:46:32 +02:00
ismailgulek
7fb89c5d9c Add retry case 2020-10-01 17:44:30 +03:00
ismailgulek
d2d127fe12 Merge branch 'develop' into element_3679 
# Conflicts:
#	CHANGES.rst
 2020-10-01 17:21:57 +03:00
ismailgulek
2a00687798 Only collapse bubbles both have the roomCreate tag 2020-10-01 17:19:22 +03:00
ismailgulek
e11755afca Tag room creator's join event appropriately 2020-10-01 17:18:32 +03:00
SBiOSoftWhare
a4474bdeb3
Merge branch 'develop' into support-other-browsers 2020-10-01 15:46:11 +02:00
ismailgulek
02565f3d9a
Merge branch 'develop' into element_3677 2020-10-01 14:22:26 +03:00
ismailgulek
47f6198b91 Launch background sync after reporting the call 2020-10-01 14:04:30 +03:00
SBiOSoftWhare
c6c470c092 Settings: Improve new phone number cell UI. 2020-10-01 12:26:02 +02:00
ismailgulek
0a0031f691 Add doc for lastNavigatedRoomIdFromPush property 2020-10-01 12:45:10 +03:00
ismailgulek
fe3b318ab3 Merge branch 'develop' into element_3672 2020-10-01 12:37:00 +03:00
Aaron Raimist
b0a7cb979f
Merge branch 'develop' into support-other-browsers 2020-09-30 18:42:36 -05:00
SBiOSoftWhare
052d3ac9bc
Update Riot/Modules/Secrets/Reset/SecretsResetViewModel.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-30 18:31:07 +02:00
SBiOSoftWhare
71f86bff10
Update Riot/Modules/Secrets/Reset/SecretsResetViewModelType.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-30 18:30:53 +02:00
SBiOSoftWhare
637e943ce7
Update Riot/Modules/Secrets/Reset/SecretsResetCoordinatorType.swift 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-09-30 18:29:42 +02:00
Aaron Raimist
49e7aed444
Merge branch 'develop' into support-other-browsers 2020-09-30 10:51:44 -05:00
SBiOSoftWhare
1e9ab0fa8c Merge branch 'develop' into reset_4s 2020-09-30 17:51:28 +02:00
Aaron Raimist
457b910c46
Add http and https to LSApplicationQueriesSchemes 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-09-30 10:50:42 -05:00
SBiOSoftWhare
772ce79a85 KeyVerificationCoordinator: Fix child coordinator removal issue. 2020-09-30 17:50:20 +02:00
SBiOSoftWhare
a1f44f2420 SecretsRecoveryCoordinator: Handle secrets reset flow. 2020-09-30 17:48:55 +02:00
SBiOSoftWhare
7bacee6b96 SecureBackupSetupCoordinator: Handle existing navigation router. 2020-09-30 17:48:14 +02:00
SBiOSoftWhare
a3bb43e20f Secrets recovery with passphrase: Add reset action. 2020-09-30 17:45:26 +02:00
SBiOSoftWhare
1684d7a7a8 Secrets recover with key: Add reset action. 2020-09-30 17:44:25 +02:00
SBiOSoftWhare
eea6ba53f1 Create secrets reset screen. 2020-09-30 17:43:05 +02:00
SBiOSoftWhare
bd3934dfef Secrets reset: Add warning image. 2020-09-30 17:22:04 +02:00
SBiOSoftWhare
9d992fde5f Secrets reset: Add new strings. 2020-09-30 17:21:43 +02:00
ismailgulek
7018444e7d Merge branch 'develop' into element_3672 
# Conflicts:
#	CHANGES.rst
 2020-09-30 17:31:38 +03:00
ismailgulek
b39d8e0c0a Bridge to NSError 2020-09-30 16:19:34 +03:00
ismailgulek
7c1f163ea6 Remove variable and use inline check 2020-09-30 16:03:13 +03:00
ismailgulek
f7f3bd9e0e Make BiometricsAuthenticationPresenter ObjC compatible 2020-09-30 16:02:56 +03:00
ismailgulek
c7dd0d60c1 Rename property 2020-09-30 15:58:37 +03:00
ismailgulek
e05d93884f Merge branch 'develop' into protection_fine_tuning 
# Conflicts:
#	CHANGES.rst
#	Riot/Assets/en.lproj/Vector.strings
 2020-09-30 15:19:32 +03:00
ismailgulek
97675be983 Introduce BiometricsAuthenticationPresenter 2020-09-30 15:17:10 +03:00
ismailgulek
b410a376c5 Fix error conversion 2020-09-30 14:37:36 +03:00
ismailgulek
8616ce2bd7
Update Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-09-30 14:32:14 +03:00
ismailgulek
268a850117
Update Riot/Modules/SetPinCode/PinCodePreferences.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-09-30 14:31:50 +03:00
manuroe
8f7a06c77d
Merge branch 'develop' into handleAppState 2020-09-30 13:31:01 +02:00
ismailgulek
60fdabded4
Update Riot/Managers/KeyValueStorage/KeychainStore.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2020-09-30 14:30:07 +03:00
ismailgulek
469c857a3c
Merge branch 'develop' into theme_fixes 2020-09-30 14:28:14 +03:00
manuroe
f9798d5a18 Fix Steve's comment: Avoid to register observers several times 
this does not seem to happen now but it is more future proof
 2020-09-30 13:26:47 +02:00
ismailgulek
52fb3752b3 Merge branch 'develop' into element_3672 2020-09-30 12:33:33 +03:00
ismailgulek
0d0bcb68fc Merge branch 'develop' into element_3672 
# Conflicts:
#	CHANGES.rst
 2020-09-30 12:32:40 +03:00
manuroe
b94840a022 PIN Code: Update explanation string 2020-09-30 11:22:44 +02:00
Aaron Raimist
7369369d02
Fix "Unable to open the link" when using other browsers (#3673) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-09-30 00:47:39 -05:00
ismailgulek
84685fd16e Merge branch 'protection_fine_tuning' of https://github.com/vector-im/element-ios into protection_fine_tuning 2020-09-29 18:42:52 +03:00
ismailgulek
f567c03838 Do not dismiss set pin coordinator on log out case 2020-09-29 18:42:19 +03:00
ismailgulek
309e1f1c26
Merge branch 'develop' into protection_fine_tuning 2020-09-29 18:33:22 +03:00
manuroe
34dbd7ea71 SecutirySettingsVC: Fix commented code that did not build 2020-09-29 17:08:06 +02:00