cd9a22304f
Merge branch 'master' into develop
2021-02-12 18:19:06 +03:00
1b6e975e8a
Merge branch 'release/1.2.1/master'
2021-02-12 18:19:00 +03:00
d98ea9e540
finish version++
2021-02-12 18:19:00 +03:00
c2474d369c
Merge branch 'release/1.2.1/master'
2021-02-12 18:17:32 +03:00
5d019d1f04
finish version++
2021-02-12 18:17:32 +03:00
20f1093484
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
510a06ef85
Merge branch 'release/1.2.1/master'
2021-02-12 17:44:11 +03:00
0a41d516a2
finish version++
2021-02-12 17:44:11 +03:00
2dcd18f75d
Merge pull request #4036 from vector-im/release/1.2.1/release
...
Release 1.2.1
2021-02-12 17:42:06 +03:00
237f3f6ac4
version++
2021-02-12 17:36:53 +03:00
269a34b2df
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
38ec6a4ca0
Merge branch 'develop' into element_4029
2021-02-12 16:08:57 +03:00
66e808f729
Merge pull request #4033 from vector-im/element_4018
...
NSE: Wait for VoIP Push Requests
2021-02-12 16:08:28 +03:00
ed0c7b99f6
Update CHANGES.rst
2021-02-12 15:48:22 +03:00
478b0b356f
Show dialpad option only if PSTN supported
2021-02-12 15:47:35 +03:00
2f6e90471b
Update CHANGES.rst
2021-02-12 15:30:17 +03:00
f8b5ed5f25
Wait for VoIP push request before calling contentHandler
2021-02-12 15:28:31 +03:00
dc6c6fb6c4
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
ac6c65c5a2
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
0bbf019614
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
97ae5197e5
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
fb3f9d8538
SettingsVC: Use mainSession property where needed.
2021-02-12 09:19:46 +01:00
0d64b7bb8f
XcodeGen: Add missing source file after merging develop
2021-02-11 17:03:30 +01:00
10b45d5c64
Merge remote-tracking branch 'origin/develop' into element_3812
2021-02-11 16:19:12 +01:00
2f48cc676e
Update changes
2021-02-11 15:08:56 +01:00
9fe62fca40
Settings: Add UIA support when adding a new 3pid.
2021-02-11 15:06:29 +01:00
00dd2c3c96
ReauthenticationCoordinator: Add the possibility to start directly from a MXAuthenticationSession.
2021-02-11 15:06:29 +01:00
5041b5d203
UserInteractiveAuthenticationService: Add method to retrieve authentication status from a request error.
2021-02-11 15:06:29 +01:00
88b776f716
ManageSessionVC: Handle user interactive authentication for delete device.
2021-02-11 15:06:29 +01:00
7a9947445c
Reauthentication: Update reauthentication and cross singing setup coordinator presenter parameter for ObjC.
2021-02-11 15:06:29 +01:00
19528ed48d
Remove unused properties.
2021-02-11 15:06:29 +01:00
08eabcf4fe
Cross-signing: Handle UserInteractiveAuthenticationService refactoring for cross signing setup.
2021-02-11 15:06:29 +01:00
1d730d0774
ReauthenticationCoordinator: Handle UserInteractiveAuthenticationService refactoring.
2021-02-11 15:06:29 +01:00
dd2a816cd0
Fix pbxproj conflicts.
2021-02-11 15:06:07 +01:00
86105e437f
Prepare for new sprint
2021-02-11 16:18:54 +03:00
283d523cbd
Merge branch 'master' into develop
2021-02-11 16:18:49 +03:00
a7bd1a4e05
Merge branch 'release/1.2.0/master'
2021-02-11 16:18:44 +03:00
29b8024a8c
finish version++
2021-02-11 16:18:44 +03:00
a30d1a3d51
Merge branch 'release/1.2.0/master'
2021-02-11 16:17:29 +03:00
2b05908c7f
finish version++
2021-02-11 16:17:29 +03:00
3e06c54609
Merge branch 'release/1.2.0/master'
2021-02-11 15:53:17 +03:00
3112f11749
finish version++
2021-02-11 15:53:17 +03:00
9d1d1bc29c
Merge pull request #4019 from vector-im/release/1.2.0/release
...
Release 1.2.0
2021-02-11 15:49:12 +03:00
30aa98f6ca
Update CHANGES.rst
2021-02-11 15:31:52 +03:00
3b58a125b4
version++
2021-02-11 15:24:12 +03:00
f9983f8054
Merge pull request #3810 from vector-im/voip_2746
...
Improved VoIP Signalling
2021-02-11 12:57:58 +03:00
fc3ea5b0d0
Merge pull request #3958 from vector-im/voip_tiles
...
VoIP: Call Tiles on Timeline
2021-02-11 12:09:58 +03:00
f9eb9d8e10
Merge pull request #4017 from vector-im/element_3812_2
...
Xcodegen optimisations
2021-02-11 09:55:01 +01:00
619ad4a9cc
XcodeGen: Removed useless postbuildScripts
2021-02-11 09:37:07 +01:00
4d874c0022
XcodeGen: Use same names for yml and xcconfig files in every target
2021-02-11 09:21:00 +01:00
ismailgulek
manuroe
ismailgulek
ismailgulek
manuroe
SBiOSoftWhare
SBiOSoftWhare