Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 00:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
10201 commits 46 branches 261 tags 144 MiB
Commit graph

10201 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
manuroe
45f4fe64cc
Merge pull request #4017 from vector-im/element_3812_2 
Xcodegen optimisations
 2021-02-11 09:55:01 +01:00
manuroe
0f401d940d XcodeGen: Removed useless postbuildScripts 2021-02-11 09:37:07 +01:00
manuroe
db913321b7 XcodeGen: Use same names for yml and xcconfig files in every target 2021-02-11 09:21:00 +01:00
manuroe
f04cac4e09 XcodeGen: Rename Common-*.xconfig files to Project-*.xcconfig 
to better reflect their purpose
 2021-02-11 08:56:05 +01:00
manuroe
6b5bc5a0cb Xcodegen: Have a xcconfig file dedicated to warning settings 2021-02-11 08:48:03 +01:00
ismailgulek
f41efd90d9 Merge branch 'voip_2746' into voip_tiles 
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
 2021-02-10 21:41:51 +03:00
ismailgulek
b9e9983a54
Merge pull request #3922 from vector-im/voip_dialpad 
VoIP: Implement Dial pad
 2021-02-10 21:36:52 +03:00
ismailgulek
9ce8b9d6b3
Merge pull request #3932 from vector-im/voip_dtmf 
VoIP: DTMF Support
 2021-02-10 21:36:15 +03:00
ismailgulek
7c7b512abc
Merge pull request #3963 from vector-im/voip_call_transfer 
VoIP: Implement Call Transfer Screen
 2021-02-10 12:50:37 +03:00
manuroe
8d62a76f9c Build: Remove warnings on about old IPHONEOS_DEPLOYMENT_TARGET from pods 2021-02-10 09:38:58 +01:00
manuroe
b48be60a2a XcodeGen: Fix device debug build 2021-02-10 09:37:54 +01:00
ismailgulek
b9bb5d300a Update variable name after voip_2746 changes 2021-02-10 00:51:41 +03:00
ismailgulek
190e111f66 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
ismailgulek
46f4a4f3d1 Merge branch 'voip_dialpad' into voip_dtmf 
# Conflicts:
#	CHANGES.rst
 2021-02-10 00:40:22 +03:00
ismailgulek
ab92b8b3f4 Merge branch 'voip_2746' into voip_tiles 2021-02-10 00:38:49 +03:00
ismailgulek
d09c4c9f07 Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
ismailgulek
fa6e76caac Merge branch 'develop' into voip_2746 2021-02-10 00:37:50 +03:00
ismailgulek
b3d5ae0fa0 Get rid of redundant _theme 2021-02-10 00:35:34 +03:00
ismailgulek
737360cf10 Remove k prefix from const string name 2021-02-10 00:17:43 +03:00
ismailgulek
e652206c0a Avoid force unwraps 2021-02-10 00:05:27 +03:00
manuroe
1206c69d0a XcodeGen: Fix xcconfig 2021-02-09 21:02:20 +01:00
manuroe
a47563ae2e XcodeGen: Move yml files into their sub folder 2021-02-09 19:29:17 +01:00
manuroe
d20879c501 Xcodegen: No more build settings in yml files 2021-02-09 18:57:06 +01:00
manuroe
762d090583 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
0c3a211a8a XcodeGen: Move all base settings from yml to xcconfig 2021-02-09 17:37:14 +01:00
manuroe
7187e5225e XcodeGen: Continue to make build settings uniform 2021-02-09 16:46:39 +01:00
manuroe
cb56854972 XCodegen: Make project.yml use Common.xcconfig 
which will probably become the xcconfig for the project
 2021-02-09 16:03:56 +01:00
manuroe
b152aebbe2 XcodeGen: Centralise MTL_ENABLE_DEBUG_INFO setting 2021-02-09 15:23:49 +01:00
manuroe
48df636ab3 XcodeGen: Come back to default C and C++ 2021-02-09 15:23:16 +01:00
manuroe
f851eb620f XcodeGen: Remove useless settings overides 2021-02-09 14:49:55 +01:00