Commit Graph

932 Commits

Author SHA1 Message Date
manuroe e4171cffa9 Reactions: Show at most 8 reactions
#2510
2019-07-04 11:38:48 +02:00
manuroe d7ad10ebb4 Device Verification: Name for 🔒 is "Lock"
#2526
2019-06-24 15:46:16 +02:00
manuroe e910455e3a Integrations: Manage the error of provided integrations server not responding 2019-06-21 15:06:41 +02:00
manuroe 53afe41f9a Integrations: Manage the error of no configured integrations server 2019-06-21 12:12:32 +02:00
SBiOSoftWhare a3da7eabd7 Add message edited mention string. 2019-06-12 15:35:30 +02:00
manuroe ca6b2f1298 Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
manuroe 617c3f2d60 Reactions: Add a labs setting
#2441
2019-05-20 17:31:25 +02:00
manuroe 554747529d Merge branch 'aggregations' into riot_2393 2019-05-16 14:51:14 +02:00
SBiOSoftWhare cc945f39d1 Add contextual menu strings 2019-05-15 21:11:55 +02:00
manuroe 7929b57bd0 Reactions: Translate primary reactions 2019-05-15 16:38:28 +02:00
manuroe 13492e2aa7 Device Verification: Fix bell emoji name 2019-05-06 08:19:48 +02:00
manuroe 948946727d RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe 58f2fd1d23 Merge pull request #2378 from aaronraimist/homeserver
home server -> homeserver (#2345)
2019-04-26 11:41:47 +02:00
manuroe 6913fb0c55 Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
manuroe 51cf40d3a0 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 324a8757a5 home server -> homeserver (#2345)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-04-19 21:27:10 -05:00
manuroe b6d92f0271 Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
J. Ryan Stinnett b826f7ac8d 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 f2fc4a1f28 Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe bfc7038ae7 Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00
manuroe 4633a82d91 Device Verification: Translate emoji 2019-04-16 09:33:25 +02:00
manuroe 0a71098306 Device Verification: Verified screen 2019-04-15 18:22:24 +02:00
manuroe 8ffaeb221b Device Verification: Incoming screen: UI design 2019-04-15 11:09:37 +02:00
manuroe 69dcd25c8d Device Verification: Display the "The other party cancelled the verification." modal 2019-04-11 19:38:46 +02:00
manuroe 6c301ebe24 Device Verification: Start screen: We do not need scrolling for that screen 2019-04-08 15:47:34 +02:00
manuroe b3adde1cf7 Device Verification: Verify screen: add wording 2019-04-05 23:52:04 +02:00
manuroe 2bf9d11784 Device Verification: Start screen: add "Waiting for partner to accept..." 2019-04-05 18:15:05 +02:00
manuroe 3a5adbc016 Device Verification: Start start screen UI 2019-04-05 17:43:15 +02:00
manuroe 1cb7f51792 Device Verification: Start start screen business logic 2019-04-05 15:20:20 +02:00
Andrew Morgan 9266226d97 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 09247b4bac Authentication: .well-known support (#2117). 2019-03-06 18:30:13 +01:00
manuroe e2d090d72b 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 1d36de07a8 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 f13458d49f Authentication: support SSO by using the fallback URL
#2306
2019-03-04 16:52:22 +01:00
manuroe 99b3311321 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 366eb25aab 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 558f68a1ac 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 6b1644d415 Add keybackup setup intro manual export strings 2019-02-15 19:03:20 +01:00
manuroe 0ca91af0ff Key backup: new recover method detected
#2230
2019-02-15 17:29:48 +01:00
manuroe ac02db96c2 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 d5a716c2ba Merge pull request #2245 from vector-im/riot_2195
Key backup: logout warning
2019-02-14 18:52:50 +01:00
SBiOSoftWhare 8c1a92d2f2 Add sign out warning backup in progress strings 2019-02-14 18:04:25 +01:00
manuroe 879af41aa0 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 0f80129c64 Fix a sign out warning wording 2019-02-14 16:17:27 +01:00
SBiOSoftWhare 5863db147d Add sign out warning strings 2019-02-14 16:01:33 +01:00
manuroe 0320b7bc25 Key recovery: Show errors on invalid passphrase or recovery key 2019-02-14 13:14:00 +01:00
manuroe 7eb133d51c Key recovery: Do not show anymore an error for empty backup 2019-02-14 12:46:53 +01:00
SBiOSoftWhare 862706eb0b Update key backup strings 2019-02-13 14:58:16 +01:00
SBiOSoftWhare ebe6250211 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 e39ce331a4 Add key backup recover banner strings 2019-02-01 09:33:31 +01:00