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

9365 commits

This branch
This branch
All branches
Author SHA1 Message Date
ismailgulek
47f6198b91 Launch background sync after reporting the call 2020-10-01 14:04:30 +03:00
ismailgulek
dd91d94b2d
Merge pull request #3680 from vector-im/element_3672 
Fix Message Not Shown After Push Error
 2020-10-01 13:03:23 +03: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
manuroe
d26458e4a5 Prepare for new sprint 2020-09-30 19:01:20 +02:00
manuroe
50c0e31e71 Merge branch 'master' into develop 2020-09-30 19:01:15 +02:00
manuroe
402486ed1c Merge branch 'release/1.0.13/master' 2020-09-30 19:01:07 +02:00
manuroe
6f129e4500 finish version++ 2020-09-30 19:01:06 +02:00
manuroe
3886587be3
Merge pull request #3703 from vector-im/release/1.0.13/release 
Release 1.0.13
 2020-09-30 19:00:24 +02:00
manuroe
9c9fb8e590
CHANGES: Sort items 2020-09-30 18:49:51 +02:00
manuroe
eefdcf4bc5 version++ 2020-09-30 18:42:21 +02:00
manuroe
f5fe1bc825
Merge pull request #3702 from vector-im/reset_4s 
Device verification: Add possibility to reset SSSS & Cross-Signing when recovery passphrase or key are lost
 2020-09-30 18:41:19 +02: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
SBiOSoftWhare
03684618a9 Update changes 2020-09-30 18:08:43 +02:00
SBiOSoftWhare
2ad54cce66 Update changes 2020-09-30 18:01:16 +02:00
SBiOSoftWhare
1e9ab0fa8c Merge branch 'develop' into reset_4s 2020-09-30 17:51:28 +02:00
SBiOSoftWhare
5752846a80 Update pbxproj. 2020-09-30 17:50:33 +02: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
b60e18af9f
Merge pull request #3693 from vector-im/protection_fine_tuning 
Log Out User Automatically After Some Wrong PINs/Biometrics
 2020-09-30 16:39:13 +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
a6634fec64
Merge pull request #3696 from vector-im/handleAppState 
AppDelegate: Create handleAppState as central point to handle application state
 2020-09-30 13:31:20 +02: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
330834a4e0
Merge pull request #3678 from vector-im/theme_fixes 
Various Theme Fixes
 2020-09-30 14:28:35 +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
0d4bc6cb09
Merge pull request #3701 from vector-im/PIN_explanation_update 
PIN Code: Update explanation string
 2020-09-30 11:32:03 +02:00
manuroe
b94840a022 PIN Code: Update explanation string 2020-09-30 11:22:44 +02:00
ismailgulek
e6110dfe4c
Update CHANGES.rst 2020-09-29 18:45:52 +03: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