8553aaf296
Merge branch 'develop' into voip_design_updates
...
# Conflicts:
# Podfile
# Podfile.lock
# Riot.xcodeproj/project.pbxproj
# Riot/Categories/RoomBubbleCellData.swift
# Riot/Managers/Call/CallPresenter.swift
# Riot/Modules/Room/RoomViewController.h
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/Room/Views/BubbleCells/Call/CallBubbleCellBaseContentView.swift
2021-02-15 14:25:48 +03:00
e3387fc035
XcodeGen: version++
2021-02-15 09:41:49 +01:00
b635530381
Prepare for new sprint
2021-02-12 18:19:11 +03:00
061107c8bc
Merge branch 'master' into develop
2021-02-12 18:19:06 +03:00
05a5c10bb9
Merge branch 'release/1.2.1/master'
2021-02-12 18:19:00 +03:00
9448f2686a
finish version++
2021-02-12 18:19:00 +03:00
00d41a76bb
Merge branch 'release/1.2.1/master'
2021-02-12 18:17:32 +03:00
d9216b11cd
finish version++
2021-02-12 18:17:32 +03:00
83c5743890
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
28ff6b8316
Merge branch 'release/1.2.1/master'
2021-02-12 17:44:11 +03:00
49089ee932
finish version++
2021-02-12 17:44:11 +03:00
689656b343
Merge pull request #4036 from vector-im/release/1.2.1/release
...
Release 1.2.1
2021-02-12 17:42:06 +03:00
399448810a
version++
2021-02-12 17:36:53 +03:00
33ecfced0d
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
0153d46074
Merge branch 'develop' into element_4029
2021-02-12 16:08:57 +03:00
135114e55b
Merge pull request #4033 from vector-im/element_4018
...
NSE: Wait for VoIP Push Requests
2021-02-12 16:08:28 +03:00
1b22132f7e
Update CHANGES.rst
2021-02-12 15:48:22 +03:00
8d5022575c
Show dialpad option only if PSTN supported
2021-02-12 15:47:35 +03:00
2e021d4c7f
Update CHANGES.rst
2021-02-12 15:30:17 +03:00
8f220b1e93
Wait for VoIP push request before calling contentHandler
2021-02-12 15:28:31 +03:00
7ec5f097dc
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
b5bb99890e
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
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
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
4da0a67ad0
SettingsVC: Use mainSession property where needed.
2021-02-12 09:19:46 +01:00
071cac04ca
XcodeGen: Add missing source file after merging develop
2021-02-11 17:03:30 +01:00
d37b2d3b2c
Merge remote-tracking branch 'origin/develop' into element_3812
2021-02-11 16:19:12 +01:00
79749c9b45
Update changes
2021-02-11 15:08:56 +01:00
62543b7654
Settings: Add UIA support when adding a new 3pid.
2021-02-11 15:06:29 +01:00
593f7946f5
ReauthenticationCoordinator: Add the possibility to start directly from a MXAuthenticationSession.
2021-02-11 15:06:29 +01:00
ac24a19ac9
UserInteractiveAuthenticationService: Add method to retrieve authentication status from a request error.
2021-02-11 15:06:29 +01:00
ebb3a9731e
ManageSessionVC: Handle user interactive authentication for delete device.
2021-02-11 15:06:29 +01:00
073df037d2
Reauthentication: Update reauthentication and cross singing setup coordinator presenter parameter for ObjC.
2021-02-11 15:06:29 +01:00
f48c63ea24
Remove unused properties.
2021-02-11 15:06:29 +01:00
b2ffb9098e
Cross-signing: Handle UserInteractiveAuthenticationService refactoring for cross signing setup.
2021-02-11 15:06:29 +01:00
1e81cf3164
ReauthenticationCoordinator: Handle UserInteractiveAuthenticationService refactoring.
2021-02-11 15:06:29 +01:00
5b135d14a1
Fix pbxproj conflicts.
2021-02-11 15:06:07 +01:00
5955bdf3db
Prepare for new sprint
2021-02-11 16:18:54 +03:00
d7d217d4df
Merge branch 'master' into develop
2021-02-11 16:18:49 +03:00
63403cfedc
Merge branch 'release/1.2.0/master'
2021-02-11 16:18:44 +03:00
5ecbc8b178
finish version++
2021-02-11 16:18:44 +03:00
90e7fc6a9a
Merge branch 'release/1.2.0/master'
2021-02-11 16:17:29 +03:00
fc93c8762e
finish version++
2021-02-11 16:17:29 +03:00
282bcb48de
Merge branch 'release/1.2.0/master'
2021-02-11 15:53:17 +03:00
65f51c7241
finish version++
2021-02-11 15:53:17 +03:00
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
f3bb97c06f
Update CHANGES.rst
2021-02-11 15:31:52 +03:00
197afb9b16
version++
2021-02-11 15:24:12 +03:00
2bead6c7b2
Merge pull request #3810 from vector-im/voip_2746
...
Improved VoIP Signalling
2021-02-11 12:57:58 +03:00
1f3c80a48e
Merge pull request #3958 from vector-im/voip_tiles
...
VoIP: Call Tiles on Timeline
2021-02-11 12:09:58 +03:00
ismailgulek
manuroe
ismailgulek
manuroe
ismailgulek
SBiOSoftWhare
SBiOSoftWhare