Commit Graph

7397 Commits

Author SHA1 Message Date
Weblate b479f23e6d Merge branch 'origin/develop' into Weblate. 2020-04-01 16:03:44 +00:00
manuroe ff7b7fca83 Fix CHANGES 2020-04-01 18:03:36 +02:00
Weblate 217c3636aa Merge branch 'origin/develop' into Weblate. 2020-04-01 15:58:04 +00:00
manuroe 445f9bf1f0 Merge branch 'hotfix/v0.10.5' into develop 2020-04-01 17:56:25 +02:00
manuroe e769a7b10e Fix merge conflict 2020-04-01 17:56:12 +02:00
manuroe d23ae092ea version++ 2020-04-01 17:51:38 +02:00
Mark Schulte e17597b0ac Update CHANGES.rst
Signed-off-by: Mark Schulte <schultetwin@gmail.com>
2020-04-01 17:49:26 +02:00
Mark Schulte 72d3d4ef31 AuthFallback: Stay in Riot App
When doing a SAML based SSO via Gsuite, I must click a link
specifying that I trust this app. That link will break me
out of the SSO sign-in process, and open up safari.

To fix address this, I've removed the feature that opens links in
safari.

Signed-off-by: Mark Schulte <schultetwin@gmail.com>
2020-04-01 17:49:17 +02:00
manuroe 1440a25fff Push notifications: Avoid any automatic deactivation
vector-im/riot-ios#3017
2020-04-01 17:35:28 +02:00
manuroe 1886c4cef3 Fix crash due to malformed widget 2020-04-01 17:34:35 +02:00
Chris Moos b5bd882ac0 Fix issue with joining public rooms with no guest access.
This fixes #2888.

Signed-off-by: Chris Moos <chris@chrismoos.com>
2020-04-01 17:31:31 +02:00
Weblate 00d352485d Merge branch 'origin/develop' into Weblate. 2020-04-01 13:57:36 +00:00
manuroe 845a97b240 Merge pull request #3039 from schultetwin/dont_exit_app_for_sso
AuthFallback: Stay in Riot App
2020-04-01 15:57:31 +02:00
Weblate d22cdf63d7 Merge branch 'origin/develop' into Weblate. 2020-03-30 08:04:48 +00:00
SBiOSoftWhare 746df06c37 Merge pull request #3052 from vector-im/riot_2918
Cross-Signing: Detect and expose new sign-ins
2020-03-30 10:04:43 +02:00
SBiOSoftWhare 74351d2eee Merge branch 'develop' into riot_2918
# Conflicts:
#	Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
2020-03-30 09:55:40 +02:00
Weblate e12c647691 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:55 +00:00
manuroe 679fe40a74 Merge pull request #3048 from vector-im/riot_3046
RoomMember scree: Display the verify button even in non e2e rooms
2020-03-30 08:58:50 +02:00
Weblate 3be03158c7 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:04 +00:00
manuroe 2d0cfe1b83 Merge pull request #3045 from vector-im/riot_3024_2
Security settings: Implement "Request (cross-signing private) keys"
2020-03-30 08:57:59 +02:00
manuroe 18edaa85a9 Fix unexpected cast 2020-03-27 17:39:11 +01:00
SBiOSoftWhare 0d49496c98 Update changes 2020-03-27 15:41:27 +01:00
SBiOSoftWhare 2d65bb9456 AppDelegate: Handle new sign in detection. Present an alert on new device sign in. 2020-03-27 15:41:19 +01:00
SBiOSoftWhare 3e2d383fa9 KeyVerificationCoordinator: Handle new self verification flow. 2020-03-27 15:40:29 +01:00
SBiOSoftWhare 002bf81158 Create self verification start screen. 2020-03-27 15:39:23 +01:00
SBiOSoftWhare 9217ea13f9 KeyVerificationVerifyByScanningViewModel: Improve cancelation. 2020-03-27 14:30:58 +01:00
manuroe 557e454568 Add missing i18n 2020-03-27 09:18:39 +01:00
manuroe 9e4afd6407 RoomMember scree: Display the verify button even in non e2e rooms
#3046
Display also the shield on the user to have the same screen for e2e and non e2e rooms
2020-03-27 09:12:49 +01:00
SBiOSoftWhare 1d83d09b2d KeyVerificationVerifyByScanningViewModel: Support to_device request. 2020-03-26 12:09:17 +01:00
SBiOSoftWhare 62bb07334f UserVerificationStartCoordinator: Remove useless delegate methods. 2020-03-26 11:57:29 +01:00
manuroe 73a0364299 Security settings: Implement "Request (cross-signing private) keys" 2020-03-25 10:15:34 +01:00
manuroe d1cb2ce91e Security settings: Refresh cross-signing state on opening 2020-03-25 10:14:25 +01:00
Weblate 4258cd6ea0 Merge branch 'origin/develop' into Weblate. 2020-03-24 11:04:19 +00:00
manuroe e78442bc1f Merge pull request #3041 from vector-im/riot_3040
BF: Self verification is broken
2020-03-24 12:04:14 +01:00
manuroe a91f7e2e6e BF: Self verification is broken
#3040
The screen was stuck on the request step in case of self verification (to_device events)
2020-03-24 09:14:01 +01:00
Mark Schulte 48d4ef1266 Update CHANGES.rst
Signed-off-by: Mark Schulte <schultetwin@gmail.com>
2020-03-19 08:20:13 -07:00
Mark Schulte 99114483ec AuthFallback: Stay in Riot App
When doing a SAML based SSO via Gsuite, I must click a link
specifying that I trust this app. That link will break me
out of the SSO sign-in process, and open up safari.

To fix address this, I've removed the feature that opens links in
safari.

Signed-off-by: Mark Schulte <schultetwin@gmail.com>
2020-03-19 08:15:04 -07:00
Weblate 8bb472aa08 Merge branch 'origin/develop' into Weblate. 2020-03-19 08:01:28 +00:00
SBiOSoftWhare 4330762a9f Merge pull request #3038 from vector-im/key_verification_refact
Refactor DeviceVerification prefix classes to KeyVerification
2020-03-19 09:01:23 +01:00
SBiOSoftWhare 5750dbbe92 Merge branch 'develop' into key_verification_refact 2020-03-19 08:43:55 +01:00
SBiOSoftWhare d6296b3150 Refactor DeviceVerification prefix classes to KeyVerification where needed. And move key verification related classes into the same module KeyVerification. 2020-03-18 17:39:26 +01:00
Weblate f32e20bdcb Merge branch 'origin/develop' into Weblate. 2020-03-18 15:36:40 +00:00
manuroe 6e47fb0c31 Fix build issue 2020-03-18 16:36:12 +01:00
Weblate 598e251c0a Merge branch 'origin/develop' into Weblate. 2020-03-18 14:00:17 +00:00
manuroe a90761d62b Merge pull request #3037 from vector-im/security_screen_rework
Security screen: Add a dedicated cross-signing section
2020-03-18 15:00:12 +01:00
manuroe 408b971323 Security Screen: Update actions for cross-signing 2020-03-18 13:34:52 +01:00
manuroe 214afccc41 Security Screen: Use MXCrossSigning.state 2020-03-18 10:01:23 +01:00
Weblate c4c30a9a03 Merge branch 'origin/develop' into Weblate. 2020-03-17 13:19:12 +00:00
SBiOSoftWhare a8f28e0ec0 Merge pull request #3030 from vector-im/riot_2921
Verification by DM: Support QR code
2020-03-17 14:19:05 +01:00
SBiOSoftWhare 75a0e13bd6 KeyVerificationVerifyByScanningViewModel: Remove pending QR code transaction when not used. 2020-03-17 14:06:56 +01:00