Commit graph

10383 commits

Author SHA1 Message Date
ismailgulek
73770a0228 Update CHANGES.rst 2021-02-12 15:30:17 +03:00
ismailgulek
062b8a2980 Wait for VoIP push request before calling contentHandler 2021-02-12 15:28:31 +03:00
manuroe
4f908bd4bf Fastlane: Re-enable parallelised builds
release build takes 6min instead of 6min. It should work better with the 2 previous commits.
2021-02-12 12:26:48 +01:00
manuroe
c435b58948 Fastlane: Use the "New Build System" to build releases
This is mandatory to make $(inherited) work when you include other xcconfig files. Else, build settings are just overwritten.

This lane works now thanks to the previous commit on the Podfile
2021-02-12 12:23:48 +01:00
manuroe
9df8c2c86f Podfile: Use MatrixKit for all targets and remove MatrixKit/AppExtension
MatrixKit/AppExtension is no more useful because DTCoreText does not need anymore a special handling for extensions. It does not use `[UIApplication sharedApplication] openURL:]` anymore.
2021-02-12 12:06:02 +01:00
SBiOSoftWhare
7579a8d739
Merge pull request #4023 from vector-im/element_4016
User-Interactive Authentication: Add UIA support for device deletion and add user 3PID action
2021-02-12 09:38:22 +01:00
SBiOSoftWhare
a7bc32045b SettingsVC: Use mainSession property where needed. 2021-02-12 09:19:46 +01:00
manuroe
02fab7fd5a XcodeGen: Add missing source file after merging develop 2021-02-11 17:03:30 +01:00
manuroe
0d51dddd00 Merge remote-tracking branch 'origin/develop' into element_3812 2021-02-11 16:19:12 +01:00
SBiOSoftWhare
cf207c4e49 Update changes 2021-02-11 15:08:56 +01:00
SBiOSoftWhare
bc752cc2b6 Settings: Add UIA support when adding a new 3pid. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
07fa454426 ReauthenticationCoordinator: Add the possibility to start directly from a MXAuthenticationSession. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
cd2ec00a09 UserInteractiveAuthenticationService: Add method to retrieve authentication status from a request error. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
763749f2ba ManageSessionVC: Handle user interactive authentication for delete device. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
2bfeabb1a6 Reauthentication: Update reauthentication and cross singing setup coordinator presenter parameter for ObjC. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
2db49177ae Remove unused properties. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
e4c5e99d43 Cross-signing: Handle UserInteractiveAuthenticationService refactoring for cross signing setup. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
9faea10f40 ReauthenticationCoordinator: Handle UserInteractiveAuthenticationService refactoring. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
ea2fefc34a Fix pbxproj conflicts. 2021-02-11 15:06:07 +01:00
ismailgulek
8fe054b9dd Prepare for new sprint 2021-02-11 16:18:54 +03:00
ismailgulek
1855a3489d Merge branch 'master' into develop 2021-02-11 16:18:49 +03:00
ismailgulek
a9c148912c Merge branch 'release/1.2.0/master' 2021-02-11 16:18:44 +03:00
ismailgulek
584371bc7b finish version++ 2021-02-11 16:18:44 +03:00
ismailgulek
631205dd40 Merge branch 'release/1.2.0/master' 2021-02-11 16:17:29 +03:00
ismailgulek
ac388fd6d7 finish version++ 2021-02-11 16:17:29 +03:00
ismailgulek
8d824870b5 Merge branch 'release/1.2.0/master' 2021-02-11 15:53:17 +03:00
ismailgulek
d838c14db6 finish version++ 2021-02-11 15:53:17 +03:00
ismailgulek
4792658c14
Merge pull request #4019 from vector-im/release/1.2.0/release
Release 1.2.0
2021-02-11 15:49:12 +03:00
ismailgulek
0d40964c81
Update CHANGES.rst 2021-02-11 15:31:52 +03:00
ismailgulek
51b5b120f2 version++ 2021-02-11 15:24:12 +03:00
ismailgulek
31fd3edd8d
Merge pull request #3810 from vector-im/voip_2746
Improved VoIP Signalling
2021-02-11 12:57:58 +03:00
ismailgulek
88fd9dae00
Merge pull request #3958 from vector-im/voip_tiles
VoIP: Call Tiles on Timeline
2021-02-11 12:09:58 +03:00
manuroe
45f4fe64cc
Merge pull request #4017 from vector-im/element_3812_2
Xcodegen optimisations
2021-02-11 09:55:01 +01:00
manuroe
0f401d940d XcodeGen: Removed useless postbuildScripts 2021-02-11 09:37:07 +01:00
manuroe
db913321b7 XcodeGen: Use same names for yml and xcconfig files in every target 2021-02-11 09:21:00 +01:00
manuroe
f04cac4e09 XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig
to better reflect their purpose
2021-02-11 08:56:05 +01:00
manuroe
6b5bc5a0cb Xcodegen: Have a xcconfig file dedicated to warning settings 2021-02-11 08:48:03 +01:00
ismailgulek
f41efd90d9 Merge branch 'voip_2746' into voip_tiles
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-02-10 21:41:51 +03:00
ismailgulek
b9e9983a54
Merge pull request #3922 from vector-im/voip_dialpad
VoIP: Implement Dial pad
2021-02-10 21:36:52 +03:00
ismailgulek
9ce8b9d6b3
Merge pull request #3932 from vector-im/voip_dtmf
VoIP: DTMF Support
2021-02-10 21:36:15 +03:00
ismailgulek
221fdc2c7d Move PiP view to top-right of the screen by default 2021-02-10 17:15:20 +03:00
ismailgulek
661ae3f854 Move backspace button to the right 2021-02-10 16:38:42 +03:00
ismailgulek
1610f484f4 Improve title of digit button 2021-02-10 16:38:36 +03:00
ismailgulek
4e43d5db75 Add letters to dialpad buttons 2021-02-10 16:17:38 +03:00
ismailgulek
7c7b512abc
Merge pull request #3963 from vector-im/voip_call_transfer
VoIP: Implement Call Transfer Screen
2021-02-10 12:50:37 +03:00
manuroe
8d62a76f9c Build: Remove warnings on about old IPHONEOS_DEPLOYMENT_TARGET from pods 2021-02-10 09:38:58 +01:00
manuroe
b48be60a2a XcodeGen: Fix device debug build 2021-02-10 09:37:54 +01:00
ismailgulek
b9bb5d300a Update variable name after voip_2746 changes 2021-02-10 00:51:41 +03:00
ismailgulek
df1d60139f Merge branch 'voip_call_transfer' into voip_all
# Conflicts:
#	Podfile
#	Podfile.lock
#	Riot.xcodeproj/project.pbxproj
2021-02-10 00:47:51 +03:00
ismailgulek
190e111f66 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00