Commit Graph

13178 Commits

Author SHA1 Message Date
Weblate 217de27deb Merge branch 'origin/develop' into Weblate. 2020-04-01 16:03:44 +00:00
Weblate 66344d03de Merge branch 'origin/develop' into Weblate. 2020-04-01 16:03:44 +00:00
manuroe 27ddf4786d Fix CHANGES 2020-04-01 18:03:36 +02:00
Weblate 6e68c00f86 Merge branch 'origin/develop' into Weblate. 2020-04-01 15:58:04 +00:00
Weblate c3b75b91b6 Merge branch 'origin/develop' into Weblate. 2020-04-01 15:58:04 +00:00
Weblate c60781bba6 Merge branch 'origin/develop' into Weblate. 2020-04-01 15:58:04 +00:00
manuroe e88a9073c6 Merge branch 'hotfix/v0.10.5' 2020-04-01 17:56:25 +02:00
manuroe bf3cc76c31 Merge branch 'hotfix/v0.10.5' into develop 2020-04-01 17:56:25 +02:00
manuroe 3a33816016 Fix merge conflict 2020-04-01 17:56:12 +02:00
manuroe e9d86a1a4e version++ 2020-04-01 17:51:38 +02:00
Mark Schulte b137db33e5 Update CHANGES.rst
Signed-off-by: Mark Schulte <schultetwin@gmail.com>
2020-04-01 17:49:26 +02:00
Mark Schulte 8f22df89f0 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 9c56437a39 Push notifications: Avoid any automatic deactivation
vector-im/riot-ios#3017
2020-04-01 17:35:28 +02:00
manuroe cee4793d22 Fix crash due to malformed widget 2020-04-01 17:34:35 +02:00
Chris Moos 263ceb4256 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 6a51551b9a Merge branch 'origin/develop' into Weblate. 2020-04-01 13:57:51 +00:00
Imre Kristoffer Eilertsen fa2b913b1f Translated using Weblate (Norwegian Bokmål)
Currently translated at 40.3% (375 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/nb_NO/
2020-04-01 13:57:51 +00:00
Weblate 79a4259dd0 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:57:36 +00:00
Osoitz 2e9df9ca21 Translated using Weblate (Basque)
Currently translated at 100.0% (931 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
2020-04-01 13:57:36 +00:00
Weblate 9840214e99 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:57:35 +00:00
manuroe 8037a2da06 Merge pull request #3039 from schultetwin/dont_exit_app_for_sso
AuthFallback: Stay in Riot App
2020-04-01 15:57:31 +02:00
Imre Kristoffer Eilertsen a35767dba3 Added translation using Weblate (Norwegian Bokmål) 2020-04-01 01:42:33 +00:00
random fe44e06e20 Translated using Weblate (Italian)
Currently translated at 100.0% (931 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
2020-03-31 10:27:25 +00:00
Kévin C eba17c3183 Translated using Weblate (French)
Currently translated at 100.0% (931 of 931 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2020-03-31 10:27:24 +00:00
Weblate 6ad3732edd Merge branch 'origin/develop' into Weblate. 2020-03-30 08:04:48 +00:00
Weblate 0337def057 Merge branch 'origin/develop' into Weblate. 2020-03-30 08:04:48 +00:00
Weblate b04a1515d9 Merge branch 'origin/develop' into Weblate. 2020-03-30 08:04:48 +00:00
SBiOSoftWhare 4fe3f8e53b 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 edd80b0493 Merge branch 'develop' into riot_2918
# Conflicts:
#	Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
2020-03-30 09:55:40 +02:00
Weblate 7494a12ddf Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:55 +00:00
Weblate bd5b656434 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:55 +00:00
Weblate e5d6377e8c Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:55 +00:00
manuroe ba64f7a232 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 ea4e6a339f Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:04 +00:00
Weblate d65e8bf198 Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:04 +00:00
Weblate c3e17ce71c Merge branch 'origin/develop' into Weblate. 2020-03-30 06:58:04 +00:00
manuroe d0ed7a75b4 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 46e4f3a44b Fix unexpected cast 2020-03-27 17:39:11 +01:00
SBiOSoftWhare eb940c29eb Update changes 2020-03-27 15:41:27 +01:00
SBiOSoftWhare 3175ff88a3 AppDelegate: Handle new sign in detection. Present an alert on new device sign in. 2020-03-27 15:41:19 +01:00
SBiOSoftWhare 677eed1be8 KeyVerificationCoordinator: Handle new self verification flow. 2020-03-27 15:40:29 +01:00
SBiOSoftWhare 80737bcf85 Create self verification start screen. 2020-03-27 15:39:23 +01:00
SBiOSoftWhare 4c313564eb KeyVerificationVerifyByScanningViewModel: Improve cancelation. 2020-03-27 14:30:58 +01:00
manuroe 5277f5e0c8 Add missing i18n 2020-03-27 09:18:39 +01:00
manuroe f39001abf2 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
Szimszon 6328e1fb39 Translated using Weblate (Hungarian)
Currently translated at 100.0% (924 of 924 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
2020-03-26 20:27:16 +00:00
SBiOSoftWhare 540e2cc55c KeyVerificationVerifyByScanningViewModel: Support to_device request. 2020-03-26 12:09:17 +01:00
SBiOSoftWhare ab7be02eed UserVerificationStartCoordinator: Remove useless delegate methods. 2020-03-26 11:57:29 +01:00
manuroe ae85cc7330 Security settings: Implement "Request (cross-signing private) keys" 2020-03-25 10:15:34 +01:00
manuroe 1d2fb742c0 Security settings: Refresh cross-signing state on opening 2020-03-25 10:14:25 +01:00