59cc14fa6c
[Media Picker] Fix some retain cycles and fix implicit self warnings.
2019-04-24 17:56:03 +02:00
62dbb63e9b
Merge pull request #2377 from vector-im/riot_1483
...
Jitsi integration: Use the matching WebRTC framework
2019-04-24 16:37:15 +02:00
16bee22b6a
Merge develop into riot_1483
2019-04-24 16:28:51 +02:00
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
c6cd2d0b46
Merge pull request #2372 from vector-im/riot_2323
...
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
d1dab78c34
Device Verification: Add a view model to DeviceVerificationDataLoadingViewController
2019-04-24 14:42:16 +02:00
3f669d39ee
Device Verification: Update SDK constant names changes
2019-04-24 10:35:56 +02:00
e9cef1ccb1
Merge pull request #2381 from vector-im/riot_2375_more
...
Clarify key backup details when backup exists but is not trusted in b…
2019-04-24 10:30:05 +02:00
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
74003e19bc
Merge pull request #2375 from jryans/connect-key-backup
...
Clarify key backup details when backup exists but is not trusted
2019-04-24 09:58:46 +02:00
6eb42328dd
Template: BridgePresenter: Add a completion block to dismissWithAnimated method
2019-04-24 08:57:58 +02:00
6b099d5a85
Device Verification: Make incoming requests dialogs dequeueing work without a random sleep
2019-04-24 08:55:45 +02:00
7d73552fa2
Device Verification: Remove a TODO
2019-04-24 08:23:44 +02:00
7748c6b2c8
Device Verification: Fix Steve's PR comments
2019-04-24 08:18:56 +02:00
f797f03194
Device Verification: Update SDK constant names changes
2019-04-24 08:07:50 +02:00
49a6975106
Update changes
2019-04-19 18:37:11 +02:00
a48037b583
Update pbxproj
2019-04-19 18:35:34 +02:00
9e4702ba28
Update JistiViewController to use new JitsiMeet SDK API
2019-04-19 18:34:44 +02:00
3839abdea8
Configure handle Jitsi configuration in AppDelegate
2019-04-19 18:33:21 +02:00
f2f5e4e965
Create JitsiService to abstract and configure Jisti Meet SDK
2019-04-19 18:29:53 +02:00
7fe71d507e
Put Jitsi server URL in Riot-Defaults.plist
2019-04-19 18:28:39 +02:00
cb3515083e
[Podfile] Bump deployment target to iOS 10.0 and remove MatrixSDK/JingleCallStack subspec from app extension.
2019-04-19 18:17:16 +02:00
7b233ea6a2
Bump deployment target to iOS 10.0
2019-04-19 18:14:38 +02:00
81819c16d9
Device Verification: Update wording "Verify user" -> "Verify device"
2019-04-19 11:38:48 +02:00
b646bbabc3
Device Verification: Manage display of SAS decimals
2019-04-19 11:31:19 +02:00
bba58e9a63
Device Verification: Clean dev code
2019-04-19 10:35:02 +02:00
7c64bde873
Device Verification: Manage queue of incoming requests
2019-04-18 23:15:01 +02:00
963b74fb01
Device Verification: Start: Fix missing cancelledByMe state
2019-04-18 23:12:01 +02:00
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
4abe4fa252
Device Verification: MXUser.displayname and avatar can be nil
2019-04-17 13:54:51 +02:00
abdd6ad70b
Device Verification: Display a message when the transaction has been automatically cancelled
2019-04-17 13:05:18 +02:00
cf4e41260d
Device Verification: Removed unused code from templates
2019-04-17 12:52:45 +02:00
2cdcb2cca9
Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC
2019-04-17 12:47:42 +02:00
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
155c64501a
SettingsVC: Remove dead code using EncryptionInfoView
2019-04-17 08:57:16 +02:00
806ec410b5
Device Verification: Plug it in the code more
2019-04-17 08:09:43 +02:00
3bbc964333
Device Verification: Plug it in the code
2019-04-16 17:55:40 +02:00
cc2264e56b
Device Verification: Plug the legacy verification modal
2019-04-16 15:00:57 +02:00
f036a505dd
Device Verification: Do not show back button
2019-04-16 11:36:51 +02:00
d1ceeb32cb
Device Verification: Translate emoji
2019-04-16 09:33:25 +02:00
c154da2157
Device Verification: Verified screen
2019-04-15 18:40:04 +02:00
42879dfa3b
Device Verification: Verified screen
2019-04-15 18:22:24 +02:00
29e8c1dd56
Template: Add SimpleScreenTemplate
2019-04-15 17:52:55 +02:00
71a7a1dadb
Device Verification: Incoming screen: UI: Use a rounded MXKImageView
2019-04-15 15:28:59 +02:00
fc02e10d3b
Device Verification: Incoming screen: UI: plug data
2019-04-15 14:18:44 +02:00
2ad59bf8d8
Device Verification: Incoming screen: UI design
2019-04-15 11:09:37 +02:00
95185eaa26
Device Verification: Incoming screen: working on UI
2019-04-13 00:19:01 +02:00
342aedce3b
Device Verification: Incoming screen: beginning
2019-04-12 23:19:07 +02:00
1b7e5a0e80
Device Verification: Display the "The other party cancelled the verification." modal
2019-04-11 19:38:46 +02:00
e83566b3e9
Device Verification: Verify screen: Try to make emoji names fit in their cell
2019-04-11 18:13:55 +02:00
SBiOSoftWhare
SBiOSoftWhare
manuroe
manuroe
J. Ryan Stinnett