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
9391 commits 46 branches 261 tags 144 MiB
Commit graph

9391 commits

This branch
This branch
All branches
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
4d61500217
Merge pull request #3710 from vector-im/4S_setup_check 
MXSession: Make sure vc_canSetupSecureBackup is reusable
 2020-10-01 16:49:45 +02: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
0e8178d5cb Update CHANGES.rst 2020-10-01 17:45:04 +03: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
6ff5842e61 Update CHANGES.rst 2020-10-01 17:20:56 +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
97f6a053fe
Merge pull request #3700 from aaronraimist/support-other-browsers 
Fix "Unable to open the link" when using other browsers
 2020-10-01 15:47:42 +02:00
SBiOSoftWhare
a4474bdeb3
Merge branch 'develop' into support-other-browsers 2020-10-01 15:46:11 +02:00
ismailgulek
a7df74ac8e
Merge pull request #3707 from vector-im/element_3677 
Handle Call Actions on Other Devices on VoIP Pushes
 2020-10-01 15:57:00 +03:00
SBiOSoftWhare
d256c58527
Merge pull request #3706 from vector-im/element_3688 
i18n: Add Estonian language
 2020-10-01 13:22:40 +02:00
ismailgulek
02565f3d9a
Merge branch 'develop' into element_3677 2020-10-01 14:22:26 +03:00
SBiOSoftWhare
65ce76e475
Merge pull request #3705 from vector-im/element_3645 
Settings: New phone number is invisible in dark theme
 2020-10-01 13:21:31 +02:00
ismailgulek
cd0d47186d Update CHANGES.rst 2020-10-01 14:05:53 +03:00
ismailgulek
47f6198b91 Launch background sync after reporting the call 2020-10-01 14:04:30 +03:00
SBiOSoftWhare
efb33f8280 Update changes 2020-10-01 12:46:16 +02:00
SBiOSoftWhare
71a57b08bf i18n: Add Estonian (et). 2020-10-01 12:45:43 +02:00
SBiOSoftWhare
76216be797 Update changes 2020-10-01 12:27:53 +02:00
SBiOSoftWhare
c6c470c092 Settings: Improve new phone number cell UI. 2020-10-01 12:26:02 +02: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
Aaron Raimist
b0a7cb979f
Merge branch 'develop' into support-other-browsers 2020-09-30 18:42:36 -05: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
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
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