Commit Graph

477 Commits

Author SHA1 Message Date
manuroe 168646092c Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
manuroe 474cb03232 Reactions: Add a labs setting
#2441
2019-05-20 17:31:25 +02:00
manuroe 667f4418aa Merge branch 'aggregations' into riot_2393 2019-05-16 14:51:14 +02:00
SBiOSoftWhare e11d4e5d8f Add contextual menu strings 2019-05-15 21:11:55 +02:00
manuroe 67bf9d2769 Reactions: Translate primary reactions 2019-05-15 16:38:28 +02:00
manuroe 62bee42e96 Device Verification: Fix bell emoji name 2019-05-06 08:19:48 +02:00
manuroe 106c10a45d RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe 5aa85582ad Merge pull request #2378 from aaronraimist/homeserver
home server -> homeserver (#2345)
2019-04-26 11:41:47 +02:00
manuroe da1e401dc8 Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
manuroe 7ac7365bea 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 dbafe1898d home server -> homeserver (#2345)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-04-19 21:27:10 -05:00
manuroe c8c464f3ab Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
J. Ryan Stinnett 4bbb38cc84 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 ed122b1580 Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe 68a6ee4168 Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00
manuroe dfa89b7d2b Device Verification: Translate emoji 2019-04-16 09:33:25 +02:00
manuroe ee5cf03d64 Device Verification: Verified screen 2019-04-15 18:22:24 +02:00
manuroe d0c49d2b29 Device Verification: Incoming screen: UI design 2019-04-15 11:09:37 +02:00
manuroe ca809ba205 Device Verification: Display the "The other party cancelled the verification." modal 2019-04-11 19:38:46 +02:00
manuroe 8d02ce5469 Device Verification: Start screen: We do not need scrolling for that screen 2019-04-08 15:47:34 +02:00
manuroe 8804830f0a Device Verification: Verify screen: add wording 2019-04-05 23:52:04 +02:00
manuroe 795b34cdcc Device Verification: Start screen: add "Waiting for partner to accept..." 2019-04-05 18:15:05 +02:00
manuroe b814633f31 Device Verification: Start start screen UI 2019-04-05 17:43:15 +02:00
manuroe 36c995ed1c Device Verification: Start start screen business logic 2019-04-05 15:20:20 +02:00
Andrew Morgan aa96b171f9 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-21 15:26:14 +00:00
manuroe 616f8571c0 Authentication: .well-known support (#2117). 2019-03-06 18:30:13 +01:00
manuroe bbcba68513 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 1f90575afd 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 368275861e Authentication: support SSO by using the fallback URL
#2306
2019-03-04 16:52:22 +01:00
manuroe 572039e762 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 6d19f9253d 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
SBiOSoftWhare 5a2996ecf3 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 016e8258e6 Add keybackup setup intro manual export strings 2019-02-15 19:03:20 +01:00
manuroe 6caec35e72 Key backup: new recover method detected
#2230
2019-02-15 17:29:48 +01:00
manuroe dec54fdec1 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 d8b53df041 Merge pull request #2245 from vector-im/riot_2195
Key backup: logout warning
2019-02-14 18:52:50 +01:00
SBiOSoftWhare e6f29cf47d Add sign out warning backup in progress strings 2019-02-14 18:04:25 +01:00
manuroe 51f2312ccd 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 c270305089 Fix a sign out warning wording 2019-02-14 16:17:27 +01:00
SBiOSoftWhare 8d01a11a5b Add sign out warning strings 2019-02-14 16:01:33 +01:00
manuroe d5f6cd932d Key recovery: Show errors on invalid passphrase or recovery key 2019-02-14 13:14:00 +01:00
manuroe 217c603fa1 Key recovery: Do not show anymore an error for empty backup 2019-02-14 12:46:53 +01:00
SBiOSoftWhare a28520e249 Update key backup strings 2019-02-13 14:58:16 +01:00
SBiOSoftWhare 381c9a593e 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 fa07c4cc85 Add key backup recover banner strings 2019-02-01 09:33:31 +01:00
manuroe 31b4381f21 Merge branch 'develop' into riot_2173 2019-01-31 21:17:47 +01:00
SBiOSoftWhare 2860f705ab Add key backup setup banner srtings 2019-01-31 19:44:37 +01:00
manuroe b53c6f77ca key backup settings: Manage checking state 2019-01-31 18:48:35 +01:00
manuroe 42a91d7aa8 key backup settings: Manage backup created from the device 2019-01-31 18:41:00 +01:00
manuroe 6de109b332 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