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

10118 commits

This branch
This branch
All branches
Author SHA1 Message Date
SBiOSoftWhare
a7bc32045b SettingsVC: Use mainSession property where needed. 2021-02-12 09:19:46 +01:00
SBiOSoftWhare
cf207c4e49 Update changes 2021-02-11 15:08:56 +01:00
SBiOSoftWhare
bc752cc2b6 Settings: Add UIA support when adding a new 3pid. 2021-02-11 15:06:29 +01:00
SBiOSoftWhare
07fa454426 ReauthenticationCoordinator: Add the possibility to start directly from a MXAuthenticationSession. 2021-02-11 15:06:29 +01:00
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
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
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
ismailgulek
4258df865b
Merge pull request #4015 from vector-im/jitsi_3.1.0 
Pods: Update Jitsi to 3.1.0
 2021-02-09 13:20:29 +03:00
SBiOSoftWhare
f1fac244ac
Merge pull request #4007 from vector-im/element_4006 
Cross-signing: Setup cross-signing without authentication parameters when a grace period is enabled after login
 2021-02-09 11:02:47 +01:00
Gil Eluard
63f9425ffc
Merge pull request #4003 from vector-im/element_4001 
The Invite cell behaviour is not driven by `MXRoom.isDirect` property…
 2021-02-09 10:48:00 +01:00
ismailgulek
d2c81aa7bb Update JitsiMeet sdk name 2021-02-09 12:34:45 +03:00
ismailgulek
03da63e14f Merge branch 'voip_2746' of https://github.com/vector-im/element-ios into voip_2746 2021-02-07 20:26:51 +03:00
ismailgulek
25872c0f33 Move some values to Constants 2021-02-07 20:26:19 +03:00
ismailgulek
35a08b196f Force relayouting after change on constraint 2021-02-07 20:21:57 +03:00
ismailgulek
fd213b5468 Introduce callScreenButtonTintColor on Theme and use it 2021-02-07 20:12:30 +03:00
ismailgulek
3ca7b3d010 Use baseTextPrimaryColor for labels 2021-02-07 20:04:37 +03:00
ismailgulek
aa40d26274 Keep a reference to block based notification observer and unregister it manually 2021-02-07 20:02:22 +03:00
ismailgulek
4565ee2453
Update Riot/Managers/Call/PiPView.swift 
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
 2021-02-07 19:59:31 +03:00
ismailgulek
1f2565f376 Make callTimer optional 2021-02-07 19:57:35 +03:00
ismailgulek
85ef3335e3 Rename CallService to CallPresenter 2021-02-07 19:55:36 +03:00