Commit Graph

4556 Commits

Author SHA1 Message Date
manuroe aa639a6a20 Reactions: Plug button actions 2019-05-16 07:47:23 +02:00
manuroe c06015eea5 Reactions: Customise primary reactions buttons 2019-05-15 23:35:09 +02:00
SBiOSoftWhare 391eff8a5a RoomViewController: Disable reply on single tap selection. 2019-05-15 23:30:33 +02:00
SBiOSoftWhare 900a219691 RoomViewController: Show contextual menu toolbar on long press. 2019-05-15 23:24:34 +02:00
SBiOSoftWhare 4a15db4754 Create RoomContextualMenuPresenter 2019-05-15 23:10:07 +02:00
SBiOSoftWhare 0c0fa0f451 Create RoomContextualMenuViewController 2019-05-15 23:09:03 +02:00
SBiOSoftWhare 8ed0eadf3c Create RoomContextualMenuToolbarView 2019-05-15 23:07:50 +02:00
SBiOSoftWhare 351deadd76 Create room contextual menu action enum 2019-05-15 23:02:25 +02:00
SBiOSoftWhare a30f68ff98 RoomDataSource: Add a property to show or hide timestamp when selecting an event. 2019-05-15 21:44:07 +02:00
SBiOSoftWhare 3544c50601 RoomBubbleCellData: Add a property to show or hide timestamp for selected component. 2019-05-15 21:34:32 +02:00
manuroe 1f57e1bb95 Reactions: Translate primary reactions 2019-05-15 16:38:28 +02:00
manuroe 376d5cb5d6 Reactions: Add primary reactions as message actions 2019-05-15 16:00:36 +02:00
manuroe 9f6a30ccac Device Verification: Fix buttons colors in dark theme 2019-05-06 08:21:30 +02:00
manuroe dd486e9f22 RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe 2376de39b5 RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
because message editing (#2404) is coming
2019-04-30 17:08:52 +02:00
SBiOSoftWhare 76efbd8f1f Fix room details navigation from rooms list. 2019-04-29 14:24:20 +02:00
manuroe 9272d92063 Merge pull request #2378 from aaronraimist/homeserver
home server -> homeserver (#2345)
2019-04-26 11:41:47 +02:00
SBiOSoftWhare 12ea51e67b Handle button title for restore action case in SettingsKeyBackupTableViewSection. 2019-04-25 16:10:22 +02:00
SBiOSoftWhare 866689f0a1 Merge develop into prepare_riot_2231 2019-04-25 15:59:32 +02:00
SBiOSoftWhare 7ad8790ca3 Remove check for +[UIFont systemFontOfSize:weight:] availability. 2019-04-25 12:27:31 +02:00
SBiOSoftWhare 29bb68cfc3 Remove iOS 10 availability condition in MasterTabBarController. 2019-04-25 11:53:38 +02:00
SBiOSoftWhare 1a541713e2 Use a weak reference for mediaPicker property in RoomInputToobarView. 2019-04-24 17:56:59 +02:00
SBiOSoftWhare 59cc14fa6c [Media Picker] Fix some retain cycles and fix implicit self warnings. 2019-04-24 17:56:03 +02:00
SBiOSoftWhare 16bee22b6a Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
manuroe 65b2128f6a Update Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2019-04-24 15:55:51 +02:00
manuroe c6cd2d0b46 Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
manuroe d1dab78c34 Device Verification: Add a view model to DeviceVerificationDataLoadingViewController 2019-04-24 14:42:16 +02:00
manuroe 3f669d39ee Device Verification: Update SDK constant names changes 2019-04-24 10:35:56 +02:00
manuroe 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
manuroe 6b099d5a85 Device Verification: Make incoming requests dialogs dequeueing work without a random sleep 2019-04-24 08:55:45 +02:00
manuroe 7d73552fa2 Device Verification: Remove a TODO 2019-04-24 08:23:44 +02:00
manuroe 7748c6b2c8 Device Verification: Fix Steve's PR comments 2019-04-24 08:18:56 +02:00
Aaron Raimist f0d86eeece home server -> homeserver (#2345)
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-04-19 21:27:10 -05:00
SBiOSoftWhare 9e4702ba28 Update JistiViewController to use new JitsiMeet SDK API 2019-04-19 18:34:44 +02:00
SBiOSoftWhare f2f5e4e965 Create JitsiService to abstract and configure Jisti Meet SDK 2019-04-19 18:29:53 +02:00
manuroe 81819c16d9 Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
manuroe b646bbabc3 Device Verification: Manage display of SAS decimals 2019-04-19 11:31:19 +02:00
manuroe bba58e9a63 Device Verification: Clean dev code 2019-04-19 10:35:02 +02:00
manuroe 963b74fb01 Device Verification: Start: Fix missing cancelledByMe state 2019-04-18 23:12:01 +02:00
J. Ryan Stinnett 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
manuroe 4abe4fa252 Device Verification: MXUser.displayname and avatar can be nil 2019-04-17 13:54:51 +02:00
manuroe abdd6ad70b Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe cf4e41260d Device Verification: Removed unused code from templates 2019-04-17 12:52:45 +02:00
manuroe 2cdcb2cca9 Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00
manuroe 26d9a5263c Device Verification: Hack EncryptionInfoView to display the new device verification flow when the user taps on "Verify" 2019-04-17 09:51:32 +02:00
manuroe 155c64501a SettingsVC: Remove dead code using EncryptionInfoView 2019-04-17 08:57:16 +02:00
manuroe 806ec410b5 Device Verification: Plug it in the code more 2019-04-17 08:09:43 +02:00
manuroe 3bbc964333 Device Verification: Plug it in the code 2019-04-16 17:55:40 +02:00
manuroe cc2264e56b Device Verification: Plug the legacy verification modal 2019-04-16 15:00:57 +02:00
manuroe f036a505dd Device Verification: Do not show back button 2019-04-16 11:36:51 +02:00