Commit graph

9830 commits

Author SHA1 Message Date
Gil Eluard
21f652b31a Merge branch 'develop' into element_3816
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/BugReport/BugReportViewController.m
2021-01-11 12:18:30 +01:00
Gil Eluard
66bc284744
Merge pull request #3882 from vector-im/element_3881
Added change PIN code feature from the settings
2021-01-11 10:21:24 +01:00
Gil Eluard
5660f1d4ee
Update Riot/Modules/BugReport/BugReportViewController.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:57:49 +01:00
Gil Eluard
0b7fbc69e9
Update Riot/Modules/BugReport/BugReportViewController.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:57:35 +01:00
Gil Eluard
4f31305549
Update Riot/Modules/BugReport/BugReportViewController.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:57:27 +01:00
Gil Eluard
768774a1c8
Update Riot/Modules/BugReport/BugReportViewController.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:57:19 +01:00
Gil Eluard
31398d277e
Update CHANGES.rst
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:56:51 +01:00
Gil Eluard
94c355f2d9
Merge branch 'develop' into element_3881 2021-01-11 09:53:32 +01:00
SBiOSoftWhare
63da5b7b12
Merge pull request #3890 from vector-im/element_3846
Implement social login
2021-01-08 17:48:55 +01:00
SBiOSoftWhare
b77ec3e25d
Merge branch 'develop' into element_3846 2021-01-08 17:48:11 +01:00
SBiOSoftWhare
3f3a06753a Fix typo with SSO authentication completion handler type alias. 2021-01-08 16:33:31 +01:00
SBiOSoftWhare
5a5122a6ec Fix typo in SSOURLConstants. 2021-01-08 16:21:12 +01:00
SBiOSoftWhare
ffbdd805c3 Update SocialLoginButton. 2021-01-08 16:19:18 +01:00
SBiOSoftWhare
68f4bcfc23
Update Riot/Categories/UIImage.swift
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-01-08 15:52:23 +01:00
Gil Eluard
a3fb07184e
Update Riot/Modules/SetPinCode/EnterPinCode/EnterPinCodeViewModel.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2021-01-08 14:46:43 +01:00
Gil Eluard
a3802b8dd2
Update Riot/Modules/SetPinCode/EnterPinCode/EnterPinCodeViewModel.swift
Co-authored-by: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2021-01-08 14:46:30 +01:00
SBiOSoftWhare
984e0789fc Update changes 2021-01-07 16:04:12 +01:00
SBiOSoftWhare
f12fe6c9c3 AuthVC: Do use fallback page when using SSO without idp. 2021-01-07 16:01:17 +01:00
SBiOSoftWhare
80b33cc40e Update pbxproj. 2021-01-07 14:56:35 +01:00
SBiOSoftWhare
8623f34a9b AppCoordinator: Handle custom scheme URL parsing and SSO deep link. 2021-01-07 14:41:01 +01:00
SBiOSoftWhare
3c2ea1ea85 SSO: Handle transaction id in AuthVC and SSOAuthenticationPresenter. 2021-01-07 14:38:27 +01:00
SBiOSoftWhare
54cfca23d1 SSOAuthenticationService: Update callback scheme property and handle transaction id. 2021-01-07 14:27:18 +01:00
SBiOSoftWhare
3edbf379e6 Add CustomSchemeURLParser that enables to parse custom scheme URL and get a deep link path at the end. 2021-01-07 14:26:23 +01:00
SBiOSoftWhare
860d9b001b Introduce DeepLinkOption that represents deep link paths with their respective parameters. 2021-01-07 12:01:32 +01:00
SBiOSoftWhare
1fb17c712b Add convenient methods on URLComponents. 2021-01-07 11:22:24 +01:00
SBiOSoftWhare
81a3e1db59 Fix pbxproj. 2021-01-05 15:54:35 +01:00
Gil Eluard
3df1214b84
Merge pull request #3894 from vector-im/element_3819
Dismiss description textview on user tap on background.
2020-12-24 10:23:22 +01:00
Gil Eluard
c58124ea03
Merge pull request #3892 from vector-im/element_3839
Show user id in the room invite preview screen
2020-12-24 10:23:03 +01:00
Gil Eluard
eb26fc6151 Dismiss description textview on user tap on background. 2020-12-23 14:58:59 +01:00
Gil Eluard
6b2721c205 Added "Continue in background" button to bug report screen 2020-12-23 13:59:40 +01:00
Gil Eluard
49eea8f04a Show user id in the room invite preview screen 2020-12-21 16:31:02 +01:00
SBiOSoftWhare
2cea584198 Update pbxproj 2020-12-18 18:44:09 +01:00
SBiOSoftWhare
1f9ba64aa8 AuthVC: Handle SSO authentication. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
d83eeccabf Add SSOAuthenticationPresenter enables to present single sign-on authentication. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
baaf9268d7 SSO authentication: Abstract and support both SFAuthenticationSession and ASWebAuthenticationSession. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
5231ec1885 Add SSOAuthenticationService 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
58c811c85f Handle custom scheme URL 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
f8bbcc48b3 SocialLoginListView: Remove debug background. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
577a0ee980 AuthVC: Support both password and social login display. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
5c60f83dae Social login: Add SocialLoginListView displays a list of social login buttons according to a given array of SSO Identity Providers. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
c25add92a8 Social login: Add strings. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
fee62afe3e Social login: Add SocialLoginButtonFactory that builds SocialLoginButton and apply dedicated theme if needed. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
bbe0cad8f0 Theme: Introduce ThemeIdentifier to make theme identification easier in Swift. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
71b1e114f2 Add SourceImage that represents a local or remote image. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
a47e277058 UIImage: Add convenient method to resize an image. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
ae1e0eaf22 Social login: Add SocialLoginButton that represents a button associated to a social login provider. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
a96607bd3f Social login: Add social login buttons assets. 2020-12-18 18:44:08 +01:00
ismailgulek
3f16bf82d8 Prepare for new sprint 2020-12-18 16:49:51 +03:00
ismailgulek
c5e625a648 Merge branch 'master' into develop 2020-12-18 16:49:46 +03:00
ismailgulek
1c1b492b76 Merge branch 'release/1.1.3/master' 2020-12-18 16:49:35 +03:00