948946727d
RoomVC: When replying, use a "Reply" button instead of "Send"
2019-04-30 17:27:57 +02:00
16687b865f
RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
...
because message editing (#2404 ) is coming
2019-04-30 17:08:52 +02:00
17421aea2e
Fix room details navigation from rooms list.
2019-04-29 14:24:20 +02:00
58f2fd1d23
Merge pull request #2378 from aaronraimist/homeserver
...
home server -> homeserver (#2345 )
2019-04-26 11:41:47 +02:00
33387e15bb
Handle button title for restore action case in SettingsKeyBackupTableViewSection.
2019-04-25 16:10:22 +02:00
1b820225e5
Merge develop into prepare_riot_2231
2019-04-25 15:59:32 +02:00
084909583b
Remove check for +[UIFont systemFontOfSize:weight:] availability.
2019-04-25 12:27:31 +02:00
cbe155a8cf
Remove iOS 10 availability condition in MasterTabBarController.
2019-04-25 11:53:38 +02:00
e4dfbb48ca
Use a weak reference for mediaPicker property in RoomInputToobarView.
2019-04-24 17:56:59 +02:00
e48aed12c8
[Media Picker] Fix some retain cycles and fix implicit self warnings.
2019-04-24 17:56:03 +02:00
0c70565ee2
Merge develop into riot_1483
2019-04-24 16:28:51 +02:00
70c8f161f0
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
6913fb0c55
Merge pull request #2372 from vector-im/riot_2323
...
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
554b3b1a68
Device Verification: Add a view model to DeviceVerificationDataLoadingViewController
2019-04-24 14:42:16 +02:00
49b3880327
Device Verification: Update SDK constant names changes
2019-04-24 10:35:56 +02:00
51cf40d3a0
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
58dc082569
Device Verification: Make incoming requests dialogs dequeueing work without a random sleep
2019-04-24 08:55:45 +02:00
d664159a14
Device Verification: Remove a TODO
2019-04-24 08:23:44 +02:00
4d1b701ed0
Device Verification: Fix Steve's PR comments
2019-04-24 08:18:56 +02:00
324a8757a5
home server -> homeserver ( #2345 )
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2019-04-19 21:27:10 -05:00
f328a0d9cd
Update JistiViewController to use new JitsiMeet SDK API
2019-04-19 18:34:44 +02:00
b56d52ff10
Create JitsiService to abstract and configure Jisti Meet SDK
2019-04-19 18:29:53 +02:00
b6d92f0271
Device Verification: Update wording "Verify user" -> "Verify device"
2019-04-19 11:38:48 +02:00
19d6c55b24
Device Verification: Manage display of SAS decimals
2019-04-19 11:31:19 +02:00
e45018e222
Device Verification: Clean dev code
2019-04-19 10:35:02 +02:00
b91749e494
Device Verification: Start: Fix missing cancelledByMe state
2019-04-18 23:12:01 +02:00
b826f7ac8d
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
00f4857ce2
Device Verification: MXUser.displayname and avatar can be nil
2019-04-17 13:54:51 +02:00
f2fc4a1f28
Device Verification: Display a message when the transaction has been automatically cancelled
2019-04-17 13:05:18 +02:00
873d674267
Device Verification: Removed unused code from templates
2019-04-17 12:52:45 +02:00
bfc7038ae7
Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC
2019-04-17 12:47:42 +02:00
3593907360
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
66f8308451
SettingsVC: Remove dead code using EncryptionInfoView
2019-04-17 08:57:16 +02:00
938c1b4910
Device Verification: Plug it in the code more
2019-04-17 08:09:43 +02:00
458985bd05
Device Verification: Plug it in the code
2019-04-16 17:55:40 +02:00
82927fa7a7
Device Verification: Plug the legacy verification modal
2019-04-16 15:00:57 +02:00
645736e12d
Device Verification: Do not show back button
2019-04-16 11:36:51 +02:00
4633a82d91
Device Verification: Translate emoji
2019-04-16 09:33:25 +02:00
919d0f1523
Device Verification: Verified screen
2019-04-15 18:40:04 +02:00
0a71098306
Device Verification: Verified screen
2019-04-15 18:22:24 +02:00
c2cdfa71ae
Device Verification: Incoming screen: UI: Use a rounded MXKImageView
2019-04-15 15:28:59 +02:00
7cb5e71bcb
Device Verification: Incoming screen: UI: plug data
2019-04-15 14:18:44 +02:00
8ffaeb221b
Device Verification: Incoming screen: UI design
2019-04-15 11:09:37 +02:00
666d71378e
Device Verification: Incoming screen: working on UI
2019-04-13 00:19:01 +02:00
2ba32d734c
Device Verification: Incoming screen: beginning
2019-04-12 23:19:07 +02:00
69dcd25c8d
Device Verification: Display the "The other party cancelled the verification." modal
2019-04-11 19:38:46 +02:00
8e770cdb67
Device Verification: Verify screen: Try to make emoji names fit in their cell
2019-04-11 18:13:55 +02:00
8e09880b95
Device Verification: Verify screen: bind transaction.confirmSASMatch()
2019-04-11 18:12:30 +02:00
8610dafc45
Update SettingsKeyBackupTableViewSection to prepare restore button removal when all keys are stored on device.
2019-04-11 10:40:26 +02:00
1d9bb522b2
Merge branch 'develop' into avoid_tableview_crashes_settings
2019-04-10 17:49:37 +02:00
manuroe
SBiOSoftWhare
manuroe
Aaron Raimist
J. Ryan Stinnett
SBiOSoftWhare