manuroe
2e67d0fee8
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
8db2f8df6a
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
4da0a67ad0
SettingsVC: Use mainSession property where needed.
2021-02-12 09:19:46 +01:00
manuroe
071cac04ca
XcodeGen: Add missing source file after merging develop
2021-02-11 17:03:30 +01:00
manuroe
d37b2d3b2c
Merge remote-tracking branch 'origin/develop' into element_3812
2021-02-11 16:19:12 +01:00
SBiOSoftWhare
79749c9b45
Update changes
2021-02-11 15:08:56 +01:00
SBiOSoftWhare
62543b7654
Settings: Add UIA support when adding a new 3pid.
2021-02-11 15:06:29 +01:00
SBiOSoftWhare
593f7946f5
ReauthenticationCoordinator: Add the possibility to start directly from a MXAuthenticationSession.
2021-02-11 15:06:29 +01:00
SBiOSoftWhare
ac24a19ac9
UserInteractiveAuthenticationService: Add method to retrieve authentication status from a request error.
2021-02-11 15:06:29 +01:00
SBiOSoftWhare
ebb3a9731e
ManageSessionVC: Handle user interactive authentication for delete device.
2021-02-11 15:06:29 +01:00
SBiOSoftWhare
073df037d2
Reauthentication: Update reauthentication and cross singing setup coordinator presenter parameter for ObjC.
2021-02-11 15:06:29 +01:00
SBiOSoftWhare
f48c63ea24
Remove unused properties.
2021-02-11 15:06:29 +01:00
SBiOSoftWhare
b2ffb9098e
Cross-signing: Handle UserInteractiveAuthenticationService refactoring for cross signing setup.
2021-02-11 15:06:29 +01:00
SBiOSoftWhare
1e81cf3164
ReauthenticationCoordinator: Handle UserInteractiveAuthenticationService refactoring.
2021-02-11 15:06:29 +01:00
SBiOSoftWhare
5b135d14a1
Fix pbxproj conflicts.
2021-02-11 15:06:07 +01:00
ismailgulek
5955bdf3db
Prepare for new sprint
2021-02-11 16:18:54 +03:00
ismailgulek
d7d217d4df
Merge branch 'master' into develop
2021-02-11 16:18:49 +03:00
ismailgulek
63403cfedc
Merge branch 'release/1.2.0/master'
2021-02-11 16:18:44 +03:00
ismailgulek
5ecbc8b178
finish version++
2021-02-11 16:18:44 +03:00
ismailgulek
90e7fc6a9a
Merge branch 'release/1.2.0/master'
2021-02-11 16:17:29 +03:00
ismailgulek
fc93c8762e
finish version++
2021-02-11 16:17:29 +03:00
ismailgulek
282bcb48de
Merge branch 'release/1.2.0/master'
2021-02-11 15:53:17 +03:00
ismailgulek
65f51c7241
finish version++
2021-02-11 15:53:17 +03:00
ismailgulek
792e00e251
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
f3bb97c06f
Update CHANGES.rst
2021-02-11 15:31:52 +03:00
ismailgulek
197afb9b16
version++
2021-02-11 15:24:12 +03:00
ismailgulek
2bead6c7b2
Merge pull request #3810 from vector-im/voip_2746
...
Improved VoIP Signalling
2021-02-11 12:57:58 +03:00
ismailgulek
1f3c80a48e
Merge pull request #3958 from vector-im/voip_tiles
...
VoIP: Call Tiles on Timeline
2021-02-11 12:09:58 +03:00
manuroe
f158008aea
Merge pull request #4017 from vector-im/element_3812_2
...
Xcodegen optimisations
2021-02-11 09:55:01 +01:00
manuroe
adeacea14f
XcodeGen: Removed useless postbuildScripts
2021-02-11 09:37:07 +01:00
manuroe
f49b025569
XcodeGen: Use same names for yml and xcconfig files in every target
2021-02-11 09:21:00 +01:00
manuroe
494d039429
XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig
...
to better reflect their purpose
2021-02-11 08:56:05 +01:00
manuroe
32bdc6bb6b
Xcodegen: Have a xcconfig file dedicated to warning settings
2021-02-11 08:48:03 +01:00
ismailgulek
5581211cd8
Merge branch 'voip_2746' into voip_tiles
...
# Conflicts:
# Riot.xcodeproj/project.pbxproj
2021-02-10 21:41:51 +03:00
ismailgulek
75ddb3a67a
Merge pull request #3922 from vector-im/voip_dialpad
...
VoIP: Implement Dial pad
2021-02-10 21:36:52 +03:00
ismailgulek
119437cf30
Merge pull request #3932 from vector-im/voip_dtmf
...
VoIP: DTMF Support
2021-02-10 21:36:15 +03:00
ismailgulek
f7fbfaa33c
Move PiP view to top-right of the screen by default
2021-02-10 17:15:20 +03:00
ismailgulek
f16893d019
Move backspace button to the right
2021-02-10 16:38:42 +03:00
ismailgulek
56b9d3aa8b
Improve title of digit button
2021-02-10 16:38:36 +03:00
ismailgulek
00b9ec8f42
Add letters to dialpad buttons
2021-02-10 16:17:38 +03:00
ismailgulek
02dece654b
Merge pull request #3963 from vector-im/voip_call_transfer
...
VoIP: Implement Call Transfer Screen
2021-02-10 12:50:37 +03:00
manuroe
a8c09e9935
Build: Remove warnings on about old IPHONEOS_DEPLOYMENT_TARGET from pods
2021-02-10 09:38:58 +01:00
manuroe
7a0b445fff
XcodeGen: Fix device debug build
2021-02-10 09:37:54 +01:00
ismailgulek
438445f081
Update variable name after voip_2746 changes
2021-02-10 00:51:41 +03:00
ismailgulek
52d4aa4ecb
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
b522dd0e97
Merge branch 'voip_dtmf' into voip_call_transfer
2021-02-10 00:40:47 +03:00
ismailgulek
a2f7c13b74
Merge branch 'voip_dialpad' into voip_dtmf
...
# Conflicts:
# CHANGES.rst
2021-02-10 00:40:22 +03:00
ismailgulek
d56a128d3c
Merge branch 'voip_2746' into voip_tiles
2021-02-10 00:38:49 +03:00
ismailgulek
5f6caef4e4
Merge branch 'voip_2746' into voip_dialpad
2021-02-10 00:38:23 +03:00
ismailgulek
748cf53514
Merge branch 'develop' into voip_2746
2021-02-10 00:37:50 +03:00