Commit Graph

596 Commits

Author SHA1 Message Date
SBiOSoftWhare b953cd3946 Reaction history: Implement screen. 2019-07-30 17:24:45 +02:00
SBiOSoftWhare 2ad0f5c3dc Emoji picker: Implement Emoji picker screen. 2019-07-25 16:58:14 +02:00
SBiOSoftWhare 8c772d50d3 Emoji picker: Handle Emoji parsing with EmojiService. 2019-07-25 16:58:14 +02:00
manuroe 61365a71a0 Soft logout: Implement the clear data button
#2540
2019-07-23 16:20:07 +02:00
manuroe 5583591649 Soft logout: Implement design for the clear data section
#2540
2019-07-23 14:45:51 +02:00
manuroe 09b0dc5bb8 Soft logout: Implement design
This is an adapted version of the zeplin design. It uses the current app login look and feel with the copy of the zeplin design

#2540
2019-07-23 11:51:46 +02:00
manuroe 1746fbc89b Device Verification: Name for is "Clock
according to https://github.com/matrix-org/matrix-doc/blob/master/data-definitions/sas-emoji.json#L41
2019-07-15 14:06:12 +02:00
manuroe 2312d6e3c2 Edits: "(Edited)" -> "(edited)" 2019-07-12 13:18:39 +02:00
SBiOSoftWhare 67ecadb63f Update strings 2019-07-11 19:33:01 +02:00
SBiOSoftWhare 9b0c0ba96b RoomInputToolbarView: Add file upload action. 2019-07-11 19:03:32 +02:00
SBiOSoftWhare e5c53e9df7 Message edits history: Add strings. 2019-07-04 19:02:17 +02:00
manuroe 2b95ff7305 Reactions: Show at most 8 reactions
#2510
2019-07-04 11:38:48 +02:00
manuroe 7a0a5f81e0 Edits: Start history 2019-06-28 19:27:46 +02:00
manuroe 28dabe9061 Device Verification: Name for 🔒 is "Lock"
#2526
2019-06-24 15:46:16 +02:00
manuroe 5b6489c8d2 Integrations: Manage the error of provided integrations server not responding 2019-06-21 15:06:41 +02:00
manuroe 9699df26a2 Integrations: Manage the error of no configured integrations server 2019-06-21 12:12:32 +02:00
SBiOSoftWhare 94ce0ab10a Add message edited mention string. 2019-06-12 15:35:30 +02:00
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 dee42249f7 Create RoomContextualMenuViewController 2019-05-15 23:09:03 +02:00
SBiOSoftWhare e11d4e5d8f Add contextual menu strings 2019-05-15 21:11:55 +02:00
SBiOSoftWhare 1c41cdff63 Add room contextual menu images 2019-05-15 21:11:36 +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 3494cbcd8b Strings.swift 2019-04-26 15:11:20 +02:00
manuroe 5aa85582ad Merge pull request #2378 from aaronraimist/homeserver
home server -> homeserver (#2345)
2019-04-26 11:41:47 +02:00
SBiOSoftWhare 2c482e9218 Merge develop into riot_1483 2019-04-24 16:28:51 +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
SBiOSoftWhare e5b69e7bdf Put Jitsi server URL in Riot-Defaults.plist 2019-04-19 18:28:39 +02: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 0898ff3ddc Template: Add SimpleScreenTemplate 2019-04-15 17:52:55 +02:00
manuroe d0c49d2b29 Device Verification: Incoming screen: UI design 2019-04-15 11:09:37 +02:00
manuroe 25917e9013 Device Verification: Incoming screen: beginning 2019-04-12 23:19:07 +02:00
manuroe ca809ba205 Device Verification: Display the "The other party cancelled the verification." modal 2019-04-11 19:38:46 +02:00
manuroe cc464031d1 Device Verification: Start screen: We do not need scrolling for that screen 2019-04-08 16:51:07 +02:00
manuroe 8804830f0a Device Verification: Verify screen: add wording 2019-04-05 23:52:04 +02:00
manuroe 4e8b4b4321 Device Verification: Start verify screen 2019-04-05 19:09:29 +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
manuroe 09c7c6661d Device Verification: boilerplate for the start screen 2019-04-05 09:41:57 +02:00