Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
5762 commits 46 branches 261 tags 144 MiB
Commit graph

5762 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
3945a3d99d Build: Add a sh build script 2019-04-26 11:14:11 +02:00
SBiOSoftWhare
aa71fccbf1
Merge pull request #2365 from vector-im/prepare_riot_2231 
Key backup: Display the restore button only if required (WIP)
 2019-04-25 17:04:12 +02:00
SBiOSoftWhare
3da89a05ce Handle button title for restore action case in SettingsKeyBackupTableViewSection. 2019-04-25 16:10:22 +02:00
SBiOSoftWhare
cdede7fcce Merge develop into prepare_riot_2231 2019-04-25 15:59:32 +02:00
SBiOSoftWhare
be9f5c7b4c
Merge pull request #2386 from vector-im/remove_iOS9_code 
Remove code used for iOS 9 only
 2019-04-25 12:33:55 +02:00
SBiOSoftWhare
1821c35c49
Merge branch 'develop' into remove_iOS9_code 2019-04-25 12:33:47 +02:00
SBiOSoftWhare
b740c0512b
Merge pull request #2385 from vector-im/fastfile_icloud 
Fastfile: Set iCloud container environment
 2019-04-25 12:33:09 +02:00
SBiOSoftWhare
24d7c087fb Remove check for +[UIFont systemFontOfSize:weight:] availability. 2019-04-25 12:27:31 +02:00
SBiOSoftWhare
6a7a967eb5 Update changes 2019-04-25 11:57:16 +02:00
SBiOSoftWhare
04b5dd0b58 Remove iOS 10 availability condition in MasterTabBarController. 2019-04-25 11:53:38 +02:00
SBiOSoftWhare
d1d9b9f990 Remove iOS 9 local notification API usage 2019-04-25 11:52:33 +02:00
SBiOSoftWhare
3c72849f2a Update changes 2019-04-25 11:23:07 +02:00
SBiOSoftWhare
7d1ec26c2d [Fastfile] Update Xcode minimum version and set iCloud container environment. 2019-04-25 11:19:39 +02:00
SBiOSoftWhare
cd009f5fd1
Merge pull request #2382 from vector-im/media_picker_retain_cycles 
[Media picker] Fix some retain cycles
 2019-04-24 20:39:26 +02:00
manuroe
5466e87452
Merge pull request #2369 from neutralinsomniac/fix_full_width_at 
Fix remaining full-width '%' symbols in strings
 2019-04-24 18:36:33 +02:00
SBiOSoftWhare
a440e86dfc Update changes 2019-04-24 17:59:44 +02:00
SBiOSoftWhare
42ddca925f Use a weak reference for mediaPicker property in RoomInputToobarView. 2019-04-24 17:56:59 +02:00
SBiOSoftWhare
87a6d13855 [Media Picker] Fix some retain cycles and fix implicit self warnings. 2019-04-24 17:56:03 +02:00
SBiOSoftWhare
fca2437adc
Merge pull request #2377 from vector-im/riot_1483 
Jitsi integration: Use the matching WebRTC framework
 2019-04-24 16:37:15 +02:00
SBiOSoftWhare
84660597fb Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
manuroe
8d68da4da8
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
cab15e7477
Merge pull request #2372 from vector-im/riot_2323 
E2E: SAS Verification
 2019-04-24 14:51:04 +02:00
manuroe
b4c0a77ca1 Device Verification: Add a view model to DeviceVerificationDataLoadingViewController 2019-04-24 14:42:16 +02:00
manuroe
a1901e6238 Device Verification: Update SDK constant names changes 2019-04-24 10:35:56 +02:00
manuroe
232841cfca
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
manuroe
c987e80d54 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
b76465ec46
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
manuroe
387972bf49 Template: BridgePresenter: Add a completion block to dismissWithAnimated method 2019-04-24 08:57:58 +02:00
manuroe
7bc6ba25af Device Verification: Make incoming requests dialogs dequeueing work without a random sleep 2019-04-24 08:55:45 +02:00
manuroe
6eadbbdae0 Device Verification: Remove a TODO 2019-04-24 08:23:44 +02:00
manuroe
3c0237a4bd Device Verification: Fix Steve's PR comments 2019-04-24 08:18:56 +02:00
manuroe
4b2af64d0a Device Verification: Update SDK constant names changes 2019-04-24 08:07:50 +02:00
SBiOSoftWhare
c0ff595cc3 Update changes 2019-04-19 18:37:11 +02:00
SBiOSoftWhare
132cd61d54 Update pbxproj 2019-04-19 18:35:34 +02:00
SBiOSoftWhare
b4c1cd0376 Update JistiViewController to use new JitsiMeet SDK API 2019-04-19 18:34:44 +02:00
SBiOSoftWhare
4c40fa2e4d Configure handle Jitsi configuration in AppDelegate 2019-04-19 18:33:21 +02:00
SBiOSoftWhare
b6e847c638 Create JitsiService to abstract and configure Jisti Meet SDK 2019-04-19 18:29:53 +02:00
SBiOSoftWhare
39e51910f8 Put Jitsi server URL in Riot-Defaults.plist 2019-04-19 18:28:39 +02:00
SBiOSoftWhare
6a9bfe0509 [Podfile] Bump deployment target to iOS 10.0 and remove MatrixSDK/JingleCallStack subspec from app extension. 2019-04-19 18:17:16 +02:00
SBiOSoftWhare
30f70b65ff Bump deployment target to iOS 10.0 2019-04-19 18:14:38 +02:00
manuroe
e90fa1c323 Device Verification: Update wording "Verify user" -> "Verify device" 2019-04-19 11:38:48 +02:00
manuroe
bffe14f760 Device Verification: Manage display of SAS decimals 2019-04-19 11:31:19 +02:00
manuroe
b838e1c2d5 Device Verification: Clean dev code 2019-04-19 10:35:02 +02:00
manuroe
7ffe79748a Device Verification: Manage queue of incoming requests 2019-04-18 23:15:01 +02:00
manuroe
1df16d8ac7 Device Verification: Start: Fix missing cancelledByMe state 2019-04-18 23:12:01 +02:00
J. Ryan Stinnett
b5ee4a6aa9 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
771444573d Device Verification: MXUser.displayname and avatar can be nil 2019-04-17 13:54:51 +02:00
manuroe
bcacc78b3c Device Verification: Display a message when the transaction has been automatically cancelled 2019-04-17 13:05:18 +02:00
manuroe
5cad9743fb Device Verification: Removed unused code from templates 2019-04-17 12:52:45 +02:00
manuroe
d49dce7dcb Device Verification: Add DeviceVerificationDataLoading VC, a loading wheel VC 2019-04-17 12:47:42 +02:00