manuroe
c7e2a14cb6
XcodeGen: Remove old files, probably residual from a git mv
2021-02-16 08:44:26 +01:00
manuroe
742e1bd7a8
XcodeGen: version++
2021-02-15 09:41:49 +01:00
ismailgulek
9f11756034
Prepare for new sprint
2021-02-12 18:19:11 +03:00
ismailgulek
084ff1ec55
Merge branch 'master' into develop
2021-02-12 18:19:06 +03:00
ismailgulek
537fedb05e
Merge branch 'release/1.2.1/master'
2021-02-12 18:19:00 +03:00
ismailgulek
47883283bc
finish version++
2021-02-12 18:19:00 +03:00
ismailgulek
99364856a4
Merge branch 'release/1.2.1/master'
2021-02-12 18:17:32 +03:00
ismailgulek
81bc09af63
finish version++
2021-02-12 18:17:32 +03:00
manuroe
3607d3d02e
Merge pull request #4032 from vector-im/element_3812_3
...
Make our Fastfile compatible with all new xcconfig
2021-02-12 15:53:47 +01:00
ismailgulek
36072e39bc
Merge branch 'release/1.2.1/master'
2021-02-12 17:44:11 +03:00
ismailgulek
153274cc45
finish version++
2021-02-12 17:44:11 +03:00
ismailgulek
26e887fc68
Merge pull request #4036 from vector-im/release/1.2.1/release
...
Release 1.2.1
2021-02-12 17:42:06 +03:00
ismailgulek
7f454efdb1
version++
2021-02-12 17:36:53 +03:00
ismailgulek
4cf285b7e9
Merge pull request #4034 from vector-im/element_4029
...
VoIP: Expose Dial Pad only if PSTN Supported
2021-02-12 16:10:42 +03:00
ismailgulek
aa90c4fcf3
Merge branch 'develop' into element_4029
2021-02-12 16:08:57 +03:00
ismailgulek
1359463b93
Merge pull request #4033 from vector-im/element_4018
...
NSE: Wait for VoIP Push Requests
2021-02-12 16:08:28 +03:00
ismailgulek
37dc1783e6
Update CHANGES.rst
2021-02-12 15:48:22 +03:00
ismailgulek
af3c766bfe
Show dialpad option only if PSTN supported
2021-02-12 15:47:35 +03:00
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