67bf9d2769
Reactions: Translate primary reactions
2019-05-15 16:38:28 +02:00
090597f461
Reactions: Add primary reactions as message actions
2019-05-15 16:00:36 +02:00
b4b5824497
Device Verification: Fix buttons colors in dark theme
2019-05-06 08:21:30 +02:00
106c10a45d
RoomVC: When replying, use a "Reply" button instead of "Send"
2019-04-30 17:27:57 +02:00
d303c686a8
RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
...
because message editing (#2404 ) is coming
2019-04-30 17:08:52 +02:00
adb7fd3c7f
Fix room details navigation from rooms list.
2019-04-29 14:24:20 +02:00
5aa85582ad
Merge pull request #2378 from aaronraimist/homeserver
...
home server -> homeserver (#2345 )
2019-04-26 11:41:47 +02:00
9663e149b3
Handle button title for restore action case in SettingsKeyBackupTableViewSection.
2019-04-25 16:10:22 +02:00
c4f2b59f76
Merge develop into prepare_riot_2231
2019-04-25 15:59:32 +02:00
2688a1331a
Remove check for +[UIFont systemFontOfSize:weight:] availability.
2019-04-25 12:27:31 +02:00
f27cae0a37
Remove iOS 10 availability condition in MasterTabBarController.
2019-04-25 11:53:38 +02:00
7b5255e035
Use a weak reference for mediaPicker property in RoomInputToobarView.
2019-04-24 17:56:59 +02:00
be5e416f14
[Media Picker] Fix some retain cycles and fix implicit self warnings.
2019-04-24 17:56:03 +02:00
2c482e9218
Merge develop into riot_1483
2019-04-24 16:28:51 +02:00
118ab50fb8
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
da1e401dc8
Merge pull request #2372 from vector-im/riot_2323
...
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
fa3ace5bcf
Device Verification: Add a view model to DeviceVerificationDataLoadingViewController
2019-04-24 14:42:16 +02:00
1bb7131db7
Device Verification: Update SDK constant names changes
2019-04-24 10:35:56 +02:00
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
50be542bb3
Device Verification: Make incoming requests dialogs dequeueing work without a random sleep
2019-04-24 08:55:45 +02:00
e1f3722247
Device Verification: Remove a TODO
2019-04-24 08:23:44 +02:00
8a79681609
Device Verification: Fix Steve's PR comments
2019-04-24 08:18:56 +02:00
dbafe1898d
home server -> homeserver ( #2345 )
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2019-04-19 21:27:10 -05:00
e4180113fa
Update JistiViewController to use new JitsiMeet SDK API
2019-04-19 18:34:44 +02:00
c185fdd87a
Create JitsiService to abstract and configure Jisti Meet SDK
2019-04-19 18:29:53 +02:00
c8c464f3ab
Device Verification: Update wording "Verify user" -> "Verify device"
2019-04-19 11:38:48 +02:00
779df0bce7
Device Verification: Manage display of SAS decimals
2019-04-19 11:31:19 +02:00
a78cb8a366
Device Verification: Clean dev code
2019-04-19 10:35:02 +02:00
9b3d191650
Device Verification: Start: Fix missing cancelledByMe state
2019-04-18 23:12:01 +02:00
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
ce98975fc8
Device Verification: MXUser.displayname and avatar can be nil
2019-04-17 13:54:51 +02:00
ed122b1580
Device Verification: Display a message when the transaction has been automatically cancelled
2019-04-17 13:05:18 +02:00
e02f19742f
Device Verification: Removed unused code from templates
2019-04-17 12:52:45 +02:00
68a6ee4168
Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC
2019-04-17 12:47:42 +02:00
6d6932dac3
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
6b9e313654
SettingsVC: Remove dead code using EncryptionInfoView
2019-04-17 08:57:16 +02:00
d32d5eed1f
Device Verification: Plug it in the code more
2019-04-17 08:09:43 +02:00
b22ac8df4f
Device Verification: Plug it in the code
2019-04-16 17:55:40 +02:00
ce9a309657
Device Verification: Plug the legacy verification modal
2019-04-16 15:00:57 +02:00
d221e1c402
Device Verification: Do not show back button
2019-04-16 11:36:51 +02:00
dfa89b7d2b
Device Verification: Translate emoji
2019-04-16 09:33:25 +02:00
7a8ff1e9c3
Device Verification: Verified screen
2019-04-15 18:40:04 +02:00
ee5cf03d64
Device Verification: Verified screen
2019-04-15 18:22:24 +02:00
69a8edebd5
Device Verification: Incoming screen: UI: Use a rounded MXKImageView
2019-04-15 15:28:59 +02:00
de2940729c
Device Verification: Incoming screen: UI: plug data
2019-04-15 14:18:44 +02:00
d0c49d2b29
Device Verification: Incoming screen: UI design
2019-04-15 11:09:37 +02:00
fe223a6942
Device Verification: Incoming screen: working on UI
2019-04-13 00:19:01 +02:00
25917e9013
Device Verification: Incoming screen: beginning
2019-04-12 23:19:07 +02:00
ca809ba205
Device Verification: Display the "The other party cancelled the verification." modal
2019-04-11 19:38:46 +02:00
5aa4807718
Device Verification: Verify screen: Try to make emoji names fit in their cell
2019-04-11 18:13:55 +02:00
manuroe
SBiOSoftWhare
manuroe
Aaron Raimist
J. Ryan Stinnett