manuroe
f105fadc48
Merge branch 'develop' into aggregations
2019-05-20 17:57:50 +02:00
manuroe
6866fe8e2c
Reactions: Add a labs setting
...
#2441
2019-05-20 17:31:25 +02:00
manuroe
8d7f535581
Merge branch 'aggregations' into riot_2393
2019-05-16 14:51:14 +02:00
SBiOSoftWhare
d682b97441
Create RoomContextualMenuViewController
2019-05-15 23:09:03 +02:00
SBiOSoftWhare
acc13b089a
Add contextual menu strings
2019-05-15 21:11:55 +02:00
SBiOSoftWhare
dc3b10e9f1
Add room contextual menu images
2019-05-15 21:11:36 +02:00
manuroe
52a480db92
Reactions: Translate primary reactions
2019-05-15 16:38:28 +02:00
manuroe
157065c9d3
Device Verification: Fix bell emoji name
2019-05-06 08:19:48 +02:00
manuroe
ef4fed1bb2
RoomVC: When replying, use a "Reply" button instead of "Send"
2019-04-30 17:27:57 +02:00
manuroe
98bd723a9b
Strings.swift
2019-04-26 15:11:20 +02:00
manuroe
08d83114fe
Merge pull request #2378 from aaronraimist/homeserver
...
home server -> homeserver (#2345 )
2019-04-26 11:41:47 +02:00
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