525ce978d8
Add message edited mention string.
2019-06-12 15:35:30 +02:00
3ceec59779
Merge branch 'develop' into aggregations
2019-05-20 17:57:50 +02:00
824db1fab3
Reactions: Add a labs setting
...
#2441
2019-05-20 17:31:25 +02:00
ad78f4f5a5
Merge branch 'aggregations' into riot_2393
2019-05-16 14:51:14 +02:00
0c0fa0f451
Create RoomContextualMenuViewController
2019-05-15 23:09:03 +02:00
cd7bccc2ca
Add contextual menu strings
2019-05-15 21:11:55 +02:00
fcd74e3f41
Add room contextual menu images
2019-05-15 21:11:36 +02:00
1f57e1bb95
Reactions: Translate primary reactions
2019-05-15 16:38:28 +02:00
4fd30b401c
Device Verification: Fix bell emoji name
2019-05-06 08:19:48 +02:00
dd486e9f22
RoomVC: When replying, use a "Reply" button instead of "Send"
2019-04-30 17:27:57 +02:00
72bb37af7d
Strings.swift
2019-04-26 15:11:20 +02:00
9272d92063
Merge pull request #2378 from aaronraimist/homeserver
...
home server -> homeserver (#2345 )
2019-04-26 11:41:47 +02:00
16bee22b6a
Merge develop into riot_1483
2019-04-24 16:28:51 +02:00
c6cd2d0b46
Merge pull request #2372 from vector-im/riot_2323
...
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
620be4497a
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
f0d86eeece
home server -> homeserver ( #2345 )
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2019-04-19 21:27:10 -05:00
7fe71d507e
Put Jitsi server URL in Riot-Defaults.plist
2019-04-19 18:28:39 +02:00
81819c16d9
Device Verification: Update wording "Verify user" -> "Verify device"
2019-04-19 11:38:48 +02:00
72f45e7bd0
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
abdd6ad70b
Device Verification: Display a message when the transaction has been automatically cancelled
2019-04-17 13:05:18 +02:00
2cdcb2cca9
Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC
2019-04-17 12:47:42 +02:00
d1ceeb32cb
Device Verification: Translate emoji
2019-04-16 09:33:25 +02:00
42879dfa3b
Device Verification: Verified screen
2019-04-15 18:22:24 +02:00
29e8c1dd56
Template: Add SimpleScreenTemplate
2019-04-15 17:52:55 +02:00
2ad59bf8d8
Device Verification: Incoming screen: UI design
2019-04-15 11:09:37 +02:00
342aedce3b
Device Verification: Incoming screen: beginning
2019-04-12 23:19:07 +02:00
1b7e5a0e80
Device Verification: Display the "The other party cancelled the verification." modal
2019-04-11 19:38:46 +02:00
1e5a831d0b
Device Verification: Start screen: We do not need scrolling for that screen
2019-04-08 16:51:07 +02:00
ffe3840805
Device Verification: Verify screen: add wording
2019-04-05 23:52:04 +02:00
0f93acf59f
Device Verification: Start verify screen
2019-04-05 19:09:29 +02:00
daeb864025
Device Verification: Start screen: add "Waiting for partner to accept..."
2019-04-05 18:15:05 +02:00
b1404b9dbb
Device Verification: Start start screen UI
2019-04-05 17:43:15 +02:00
c20831c31a
Device Verification: Start start screen business logic
2019-04-05 15:20:20 +02:00
970a03ff9c
Device Verification: boilerplate for the start screen
2019-04-05 09:41:57 +02:00
6c48ecf0cc
Productivity: Create templates for screens and flow root coordinators
2019-04-04 17:10:21 +02:00
da62b7c205
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
fa4f571ae3
Widget: Pass scalar_token only when required
2019-03-12 15:56:19 +01:00
4090d66d0b
Authentication: .well-known support ( #2117 ).
2019-03-06 18:30:13 +01:00
89bef5b34d
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
0dd118612b
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
909bf66f19
Authentication: support SSO by using the fallback URL
...
#2306
2019-03-04 16:52:22 +01:00
3d3901502f
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
5636330f03
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
095d9df058
Maintenance: Update cocopoads and pods. Automatic update to Swift4.2
2019-02-20 16:45:32 +01:00
c68da25267
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
cee9d1ce7c
Add keybackup setup intro manual export strings
2019-02-15 19:03:20 +01:00
9dde9dcf8b
Key backup: new recover method detected
...
#2230
2019-02-15 17:29:48 +01:00
18fe73dd4c
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
324d8928f1
Merge pull request #2245 from vector-im/riot_2195
...
Key backup: logout warning
2019-02-14 18:52:50 +01:00
d0d65be4ef
Add sign out warning backup in progress strings
2019-02-14 18:04:25 +01:00
SBiOSoftWhare
manuroe
manuroe
Aaron Raimist
J. Ryan Stinnett
SBiOSoftWhare