Commit Graph

12797 Commits

Author SHA1 Message Date
ismailgulek 3c92bb1a39 Fix grouping 2020-10-02 11:48:12 +03:00
ismailgulek 7743f32e27 Fix theme 2020-10-02 11:39:19 +03:00
ismailgulek 50f47711e7 Merge branch 'develop' into element_3679 2020-10-01 19:06:33 +03:00
ismailgulek c76486b591 Merge pull request #3709 from vector-im/handle_retry_on_biometrics
Handle Retry on Biometrics
2020-10-01 19:06:03 +03:00
manuroe 429f3562d7 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 baca9c78e1 MXSession: Make sure vc_canSetupSecureBackup is reusable
Put specific additional check out of this method
2020-10-01 16:46:32 +02:00
ismailgulek 6a4ad64d20 Update CHANGES.rst 2020-10-01 17:45:04 +03:00
ismailgulek 9880942516 Add retry case 2020-10-01 17:44:30 +03:00
ismailgulek 6f1e954893 Merge branch 'develop' into element_3679
# Conflicts:
#	CHANGES.rst
2020-10-01 17:21:57 +03:00
ismailgulek 47df9367ea Update CHANGES.rst 2020-10-01 17:20:56 +03:00
ismailgulek 061ea88618 Only collapse bubbles both have the roomCreate tag 2020-10-01 17:19:22 +03:00
ismailgulek c5145f084b Tag room creator's join event appropriately 2020-10-01 17:18:32 +03:00
SBiOSoftWhare 158bcda665 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 9533a78235 Merge branch 'develop' into support-other-browsers 2020-10-01 15:46:11 +02:00
ismailgulek 36e51a05e9 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 92cb28caca Merge pull request #3706 from vector-im/element_3688
i18n: Add Estonian language
2020-10-01 13:22:40 +02:00
ismailgulek bac197a61e Merge branch 'develop' into element_3677 2020-10-01 14:22:26 +03:00
SBiOSoftWhare 23b99d74d5 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 a86f16fe41 Update CHANGES.rst 2020-10-01 14:05:53 +03:00
ismailgulek fef578c0d5 Launch background sync after reporting the call 2020-10-01 14:04:30 +03:00
SBiOSoftWhare c0390d00cf Update changes 2020-10-01 12:46:16 +02:00
SBiOSoftWhare 1745071e68 i18n: Add Estonian (et). 2020-10-01 12:45:43 +02:00
SBiOSoftWhare f42339f9ac Update changes 2020-10-01 12:27:53 +02:00
SBiOSoftWhare 53503c8e51 Settings: Improve new phone number cell UI. 2020-10-01 12:26:02 +02:00
ismailgulek 58eae87e83 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 63cb73542a Add doc for lastNavigatedRoomIdFromPush property 2020-10-01 12:45:10 +03:00
ismailgulek 7144ed6d3d Merge branch 'develop' into element_3672 2020-10-01 12:37:00 +03:00
Aaron Raimist a5c2234072 Merge branch 'develop' into support-other-browsers 2020-09-30 18:42:36 -05:00
manuroe e62d57cfce Prepare for new sprint 2020-09-30 19:01:20 +02:00
manuroe 434f82f445 Merge branch 'master' into develop 2020-09-30 19:01:15 +02:00
manuroe e39d404e66 Merge branch 'release/1.0.13/master' 2020-09-30 19:01:07 +02:00
manuroe a2b49fa1b3 finish version++ 2020-09-30 19:01:06 +02:00
manuroe a573a4b5c3 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 9baa48c5b7 CHANGES: Sort items 2020-09-30 18:49:51 +02:00
manuroe 590c655732 version++ 2020-09-30 18:42:21 +02:00
manuroe 4db03d5ffc 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 896e9056c3 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 30efc09523 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 54a5df8d12 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 50ebac99c6 Update changes 2020-09-30 18:08:43 +02:00
SBiOSoftWhare a3811b7041 Update changes 2020-09-30 18:01:16 +02:00
Aaron Raimist 258a6f8e80 Merge branch 'develop' into support-other-browsers 2020-09-30 10:51:44 -05:00
SBiOSoftWhare f2c09869cf Merge branch 'develop' into reset_4s 2020-09-30 17:51:28 +02:00
Aaron Raimist d6710cabd6 Add http and https to LSApplicationQueriesSchemes
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-09-30 10:50:42 -05:00
SBiOSoftWhare 86481517d8 Update pbxproj. 2020-09-30 17:50:33 +02:00
SBiOSoftWhare 6395f0f5fe KeyVerificationCoordinator: Fix child coordinator removal issue. 2020-09-30 17:50:20 +02:00
SBiOSoftWhare 19188936c4 SecretsRecoveryCoordinator: Handle secrets reset flow. 2020-09-30 17:48:55 +02:00
SBiOSoftWhare 44982dd5a3 SecureBackupSetupCoordinator: Handle existing navigation router. 2020-09-30 17:48:14 +02:00
SBiOSoftWhare 72b244190d Secrets recovery with passphrase: Add reset action. 2020-09-30 17:45:26 +02:00
SBiOSoftWhare 53e0b2e0cd Secrets recover with key: Add reset action. 2020-09-30 17:44:25 +02:00