Commit Graph

10267 Commits

Author SHA1 Message Date
SBiOSoftWhare 532f0d4966 Update changes 2021-02-11 15:08:56 +01:00
SBiOSoftWhare a1b2bef3a1 Settings: Add UIA support when adding a new 3pid. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare bf5311c5a8 ReauthenticationCoordinator: Add the possibility to start directly from a MXAuthenticationSession. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 1245454a26 UserInteractiveAuthenticationService: Add method to retrieve authentication status from a request error. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 41a0025804 ManageSessionVC: Handle user interactive authentication for delete device. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 71121a84fa Reauthentication: Update reauthentication and cross singing setup coordinator presenter parameter for ObjC. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 2db3230cf6 Remove unused properties. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare d5917beb6a Cross-signing: Handle UserInteractiveAuthenticationService refactoring for cross signing setup. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 9bc388a139 ReauthenticationCoordinator: Handle UserInteractiveAuthenticationService refactoring. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare 87da725c4c Fix pbxproj conflicts. 2021-02-11 15:06:07 +01:00
ismailgulek 7795050c4d Prepare for new sprint 2021-02-11 16:18:54 +03:00
ismailgulek 264de209ba Merge branch 'master' into develop 2021-02-11 16:18:49 +03:00
ismailgulek f218975a43 Merge branch 'release/1.2.0/master' 2021-02-11 16:18:44 +03:00
ismailgulek 69dc512d29 finish version++ 2021-02-11 16:18:44 +03:00
ismailgulek 4848a63f81 Merge branch 'release/1.2.0/master' 2021-02-11 16:17:29 +03:00
ismailgulek b54b2aaee3 finish version++ 2021-02-11 16:17:29 +03:00
ismailgulek a762fe4cdf Merge branch 'release/1.2.0/master' 2021-02-11 15:53:17 +03:00
ismailgulek cb44f34616 finish version++ 2021-02-11 15:53:17 +03:00
ismailgulek 88eadf7805 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 78e5b27249 Update CHANGES.rst 2021-02-11 15:31:52 +03:00
ismailgulek 76a70c8e52 version++ 2021-02-11 15:24:12 +03:00
ismailgulek f6a3873e18 Merge pull request #3810 from vector-im/voip_2746
Improved VoIP Signalling
2021-02-11 12:57:58 +03:00
ismailgulek 60144535f1 Merge pull request #3958 from vector-im/voip_tiles
VoIP: Call Tiles on Timeline
2021-02-11 12:09:58 +03:00
manuroe 9c036bd8f3 Merge pull request #4017 from vector-im/element_3812_2
Xcodegen optimisations
2021-02-11 09:55:01 +01:00
manuroe 15597c38b2 XcodeGen: Removed useless postbuildScripts 2021-02-11 09:37:07 +01:00
manuroe ac7cf9f1ce XcodeGen: Use same names for yml and xcconfig files in every target 2021-02-11 09:21:00 +01:00
manuroe 926d655883 XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig
to better reflect their purpose
2021-02-11 08:56:05 +01:00
manuroe 8d5b899425 Xcodegen: Have a xcconfig file dedicated to warning settings 2021-02-11 08:48:03 +01:00
ismailgulek c018da167c Merge branch 'voip_2746' into voip_tiles
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-02-10 21:41:51 +03:00
ismailgulek 6ffe693b01 Merge pull request #3922 from vector-im/voip_dialpad
VoIP: Implement Dial pad
2021-02-10 21:36:52 +03:00
ismailgulek 699ae5c500 Merge pull request #3932 from vector-im/voip_dtmf
VoIP: DTMF Support
2021-02-10 21:36:15 +03:00
ismailgulek f594106b8e Merge pull request #3963 from vector-im/voip_call_transfer
VoIP: Implement Call Transfer Screen
2021-02-10 12:50:37 +03:00
manuroe ee0ae296eb Build: Remove warnings on about old IPHONEOS_DEPLOYMENT_TARGET from pods 2021-02-10 09:38:58 +01:00
manuroe f47fe43461 XcodeGen: Fix device debug build 2021-02-10 09:37:54 +01:00
ismailgulek e315c99e42 Update variable name after voip_2746 changes 2021-02-10 00:51:41 +03:00
ismailgulek 295e86a905 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
ismailgulek c37ed97a5b Merge branch 'voip_dialpad' into voip_dtmf
# Conflicts:
#	CHANGES.rst
2021-02-10 00:40:22 +03:00
ismailgulek dc8afd1b29 Merge branch 'voip_2746' into voip_tiles 2021-02-10 00:38:49 +03:00
ismailgulek 690afd773d Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
ismailgulek 43e0dfa7e3 Merge branch 'develop' into voip_2746 2021-02-10 00:37:50 +03:00
ismailgulek 72284b570c Get rid of redundant _theme 2021-02-10 00:35:34 +03:00
ismailgulek 9944b607a4 Remove k prefix from const string name 2021-02-10 00:17:43 +03:00
ismailgulek 9ff24791cc Avoid force unwraps 2021-02-10 00:05:27 +03:00
manuroe 9d00143721 XcodeGen: Fix xcconfig 2021-02-09 21:02:20 +01:00
manuroe ffd0f2865f XcodeGen: Move yml files into their sub folder 2021-02-09 19:29:17 +01:00
manuroe dc7cd467cd Xcodegen: No more build settings in yml files 2021-02-09 18:57:06 +01:00
manuroe 19a8eb42e2 XcodeGen: Common.xcconfig does not need to be included by targets anymore
It is loaded by the project (project.yml)
2021-02-09 18:10:56 +01:00
manuroe 275f960b22 XcodeGen: Move all base settings from yml to xcconfig 2021-02-09 17:37:14 +01:00
manuroe dea6de23a2 XcodeGen: Continue to make build settings uniform 2021-02-09 16:46:39 +01:00
manuroe 24e9f18521 XCodegen: Make project.yml use Common.xcconfig
which will probably become the xcconfig for the project
2021-02-09 16:03:56 +01:00