Commit graph

768 commits

Author SHA1 Message Date
SBiOSoftWhare
84660597fb Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
manuroe
cab15e7477
Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
manuroe
c987e80d54 Clarify key backup details when backup exists but is not trusted in banner too
This follows changes made by https://github.com/vector-im/riot-ios/pull/2375
2019-04-24 10:23:27 +02:00
Aaron Raimist
d710b3788d
home server -> homeserver (#2345)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-04-19 21:27:10 -05:00
SBiOSoftWhare
39e51910f8 Put Jitsi server URL in Riot-Defaults.plist 2019-04-19 18:28:39 +02:00
manuroe
e90fa1c323 Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
J. Ryan Stinnett
b5ee4a6aa9 Clarify key backup details when backup exists but is not trusted
This ports the wording changes from Riot Web
https://github.com/matrix-org/matrix-react-sdk/pull/2917.

"Use key backup" as button text feels like it's telling me I haven't set it up
at all. This changes to "Connect this device ..." which seems more reassuring
and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but
it's not being used by the current device so that it's much more clear that you
have a backup at least.
2019-04-18 13:30:32 +01:00
manuroe
bcacc78b3c Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe
d49dce7dcb Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00
manuroe
b12c2af145 Device Verification: Translate emoji 2019-04-16 09:33:25 +02:00
manuroe
1a7d642325 Device Verification: Verified screen 2019-04-15 18:22:24 +02:00
manuroe
dc978c7f31 Template: Add SimpleScreenTemplate 2019-04-15 17:52:55 +02:00
manuroe
bdefacff0e Device Verification: Incoming screen: UI design 2019-04-15 11:09:37 +02:00
manuroe
a9502603d6 Device Verification: Incoming screen: beginning 2019-04-12 23:19:07 +02:00
manuroe
785bc7f176 Device Verification: Display the "The other party cancelled the verification." modal 2019-04-11 19:38:46 +02:00
manuroe
c9989aef29 Device Verification: Start screen: We do not need scrolling for that screen 2019-04-08 16:51:07 +02:00
manuroe
e32f32668b Device Verification: Verify screen: add wording 2019-04-05 23:52:04 +02:00
manuroe
7269e2fc8b Device Verification: Start verify screen 2019-04-05 19:09:29 +02:00
manuroe
b8ee5d7cd6 Device Verification: Start screen: add "Waiting for partner to accept..." 2019-04-05 18:15:05 +02:00
manuroe
0a944c73aa Device Verification: Start start screen UI 2019-04-05 17:43:15 +02:00
manuroe
c684d0bf6d Device Verification: Start start screen business logic 2019-04-05 15:20:20 +02:00
manuroe
3058a92506 Device Verification: boilerplate for the start screen 2019-04-05 09:41:57 +02:00
manuroe
e558c89a8e Productivity: Create templates for screens and flow root coordinators 2019-04-04 17:10:21 +02:00
manuroe
5857f49dc3 Fix grammar in registration text
I assume some script needs to be run to generate the other string files, but if you want to just do that yourselves and take the text in this PR I'm totally fine with that.
2019-03-27 15:44:01 +01:00
manuroe
f881531422 Widget: Pass scalar_token only when required 2019-03-12 15:56:19 +01:00
manuroe
4b571ac6dd Authentication: .well-known support (#2117). 2019-03-06 18:30:13 +01:00
manuroe
02ceb87ed0
Merge pull request #2307 from vector-im/light_sso_support
Authentication: support SSO by using the fallback URL
2019-03-04 18:18:41 +00:00
SBiOSoftWhare
396f184bc1 Handle quick tap on link in RoomViewController. Retrieve URL interaction information when user tap a link in a MXKRoomBubbleTableViewCell to indicate the type of interaction expected with the URL. 2019-03-04 18:29:13 +01:00
manuroe
6b2377b763 Authentication: support SSO by using the fallback URL
#2306
2019-03-04 16:52:22 +01:00
manuroe
932fcd888f RoomVC: Remove the beta warning modal when enabling e2e in a room
This is the other part of #2239.
2019-02-21 15:07:50 +01:00
manuroe
2d66a7ecd3 Add app store description as app string resource to make them available for translation on weblate
#2201
2019-02-20 18:22:50 +01:00
manuroe
7a5c0bef99 Maintenance: Update cocopoads and pods. Automatic update to Swift4.2 2019-02-20 16:45:32 +01:00
SBiOSoftWhare
e73e050fd0
Merge pull request #2255 from vector-im/export_keys
Key backup: Handle manual key export in key backup setup intro screen
2019-02-15 19:22:38 +01:00
SBiOSoftWhare
4b3a18f874 Add keybackup setup intro manual export strings 2019-02-15 19:03:20 +01:00
manuroe
f505440710 Key backup: new recover method detected
#2230
2019-02-15 17:29:48 +01:00
manuroe
84ec248a3e
Merge pull request #2246 from vector-im/settings_backup_update_copy
Backup settings: Update wording and rendering to match riot-web
2019-02-14 19:18:56 +01:00
SBiOSoftWhare
2897c03382
Merge pull request #2245 from vector-im/riot_2195
Key backup: logout warning
2019-02-14 18:52:50 +01:00
SBiOSoftWhare
60e2797a88 Add sign out warning backup in progress strings 2019-02-14 18:04:25 +01:00
manuroe
d144db8ad7 Backup settings: Update wording and rendering to match riot-web
Verify button has been removed and replaced by "Use key backup", which makes a restore, because we trust on decrypt now.
2019-02-14 17:47:59 +01:00
SBiOSoftWhare
9902df5996 Update strings 2019-02-14 16:22:41 +01:00
SBiOSoftWhare
8304e3d564 Add sign out warning strings 2019-02-14 16:01:33 +01:00
manuroe
07be13e130 Key recovery: Show errors on invalid passphrase or recovery key 2019-02-14 13:14:00 +01:00
manuroe
309ee56feb Key recovery: Do not show anymore an error for empty backup 2019-02-14 12:46:53 +01:00
SBiOSoftWhare
d668ba28a4 Remove former key backup setup success scene 2019-02-13 15:02:31 +01:00
SBiOSoftWhare
d3efbd2633 Create new key backup setup success view controllers 2019-02-13 14:58:16 +01:00
SBiOSoftWhare
2cbf0380d8 Update key backup strings 2019-02-13 14:58:16 +01:00
SBiOSoftWhare
7e473554e5 Update key backup logo image 2019-02-13 14:58:16 +01:00
SBiOSoftWhare
6a175d4838 Enhance tap on room predecessor cell used to go back to the old version of the room (Fix issue #2179) 2019-02-04 15:49:49 +01:00
SBiOSoftWhare
8e3032a7ef Add key backup recover banner strings 2019-02-01 09:33:31 +01:00
manuroe
1ca5ee4356
Merge branch 'develop' into riot_2173 2019-01-31 21:17:47 +01:00
SBiOSoftWhare
f2ed445a66 Add key backup banner close image 2019-01-31 19:45:00 +01:00
SBiOSoftWhare
4f8c186279 Add key backup setup banner srtings 2019-01-31 19:44:37 +01:00
manuroe
19e699a91d key backup settings: Manage checking state 2019-01-31 18:48:35 +01:00
manuroe
fe78e6b479 key backup settings: Manage backup created from the device 2019-01-31 18:41:00 +01:00
manuroe
94bd0bcb75 key backup settings: Make it look like more to https://github.com/vector-im/riot-meta/issues/251#issuecomment-458566684
2/2

Manage not trusted backup
2019-01-31 18:19:20 +01:00
manuroe
61f439eb55 key backup settings: Make it look like more to https://github.com/vector-im/riot-meta/issues/251#issuecomment-458566684
1/2
2019-01-31 16:58:41 +01:00
manuroe
0de85dd93c key backup settings: add delete confirmation dialog 2019-01-31 09:45:03 +01:00
manuroe
91861ef4df key backup: Add a dedicated section to settings
#2193

Still WIP
2019-01-31 03:06:47 +01:00
SBiOSoftWhare
7a6024b9c0 Update pbxproj 2019-01-30 11:14:03 +01:00
SBiOSoftWhare
c5a1aecd76 Add key backup recover images 2019-01-30 11:14:02 +01:00
SBiOSoftWhare
8947ee3273 Add key backup recover wordings 2019-01-30 11:14:02 +01:00
SBiOSoftWhare
1a36e6e9f1 Update generated strings 2019-01-22 17:49:29 +01:00
SBiOSoftWhare
d4d551bea1 Implement key backup setup recovery key scene with view controller, view model and coordinator 2019-01-22 11:04:06 +01:00
SBiOSoftWhare
b737addfd1 Add reveal password button image 2019-01-21 23:32:51 +01:00
SBiOSoftWhare
af88234580 Add key backup setup strings 2019-01-21 23:31:33 +01:00
manuroe
b4724e46d2 BF: Infinite loading wheel when taping on a fake room alias
#679
2019-01-17 17:46:49 +01:00
manuroe
64febced2d RoomVC: Redact has been renamed to Remove to match riot/web
#2134
2019-01-16 16:51:36 +01:00
SBiOSoftWhare
2ef58cbceb Add SwiftGen to Riot build phases and generate constants 2019-01-14 17:04:40 +01:00