Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
6202 commits 46 branches 261 tags 144 MiB
Commit graph

197 commits

Author SHA1 Message Date
SBiOSoftWhare
928eb0c69e RoomInputToolbarView: Add file upload action. 2019-07-11 19:03:32 +02:00
SBiOSoftWhare
393340a787 Message edits history: Add strings. 2019-07-04 19:02:17 +02:00
manuroe
2a22e4c0a9 Reactions: Show at most 8 reactions 
#2510
 2019-07-04 11:38:48 +02:00
manuroe
6ff7530d8a Device Verification: Name for 🔒 is "Lock" 
#2526
 2019-06-24 15:46:16 +02:00
manuroe
918adc5b7a Integrations: Manage the error of provided integrations server not responding 2019-06-21 15:06:41 +02:00
manuroe
948105b03d Integrations: Manage the error of no configured integrations server 2019-06-21 12:12:32 +02:00
SBiOSoftWhare
3625bc439a Add message edited mention string. 2019-06-12 15:35:30 +02:00
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
acc13b089a Add contextual menu strings 2019-05-15 21:11:55 +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
15698b8b91 Add a description for NSCalendarsUsageDescription 
This permission has been introduced by the jitsi update.
 2019-04-26 15:10:56 +02:00
manuroe
08d83114fe
Merge pull request #2378 from aaronraimist/homeserver 
home server -> homeserver (#2345)
 2019-04-26 11:41:47 +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
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
bdefacff0e Device Verification: Incoming screen: UI design 2019-04-15 11:09:37 +02:00
manuroe
785bc7f176 Device Verification: Display the "The other party cancelled the verification." modal 2019-04-11 19:38:46 +02:00
manuroe
b0a8f8167e Device Verification: Start screen: We do not need scrolling for that screen 2019-04-08 15:47:34 +02:00
manuroe
e32f32668b Device Verification: Verify screen: add wording 2019-04-05 23:52:04 +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
SBiOSoftWhare
5a1c23ae8c Merge branch 'develop' into riot_2337 
# Conflicts:
#	CHANGES.rst
#	Riot/AppDelegate.m
 2019-04-05 16:31:52 +02:00
manuroe
c684d0bf6d Device Verification: Start start screen business logic 2019-04-05 15:20:20 +02:00
SBiOSoftWhare
a005578671 Update notification strings for notification titles 2019-04-04 17:45:13 +02:00
fridtjof
0448c3183d
finalize emote style notifications 2019-03-22 01:20:50 +01:00
fridtjof
b35e62f1cd
add additional notification titles 2019-03-22 01:10:57 +01:00
fridtjof
490e6f8096
add a threadIdentifier to notifications and implement titles 2019-03-22 00:40:27 +01:00
Andrew Morgan
839871aa29
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
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
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