Commit graph

1631 commits

Author SHA1 Message Date
manuroe
79cdebf9d2
Merge branch 'develop' into 3990_matrix.to 2021-02-03 12:06:04 +01:00
manuroe
bcf57406ef matrix.to: The app does not open a permalink from matrix.to
#3993
2021-02-02 17:59:44 +01:00
manuroe
e42a2597d0 matrix.to: Support room preview when the permalink has parameters (like "via=")
It works. There is no reason for not doing it
2021-02-02 17:13:01 +01:00
manuroe
ac7c62fbd3 matrix.to: Cannot open/preview a new room given by alias
#3991

Add a patch to try to build the right string and to avoid to loop forever
2021-02-02 17:07:12 +01:00
manuroe
c28dbf2f35 matrix.to: Cannot open links with query parameters
#3990

The string can come percent encoded but we parse it with ascii chars ("?", "&", ...).
So, remove one layer of encoding to fix the bug.
2021-02-02 16:26:49 +01:00
Gil Eluard
1192589980 Merge branch 'develop' into element_3969
# Conflicts:
#	CHANGES.rst
2021-02-02 12:07:10 +01:00
Gil Eluard
3db4a6acc6 Force device verification on user share key re-request if device is not verified. 2021-02-02 11:31:21 +01:00
Gil Eluard
ebb8a0ed62 Update after review 2021-02-01 09:53:17 +01:00
Gil Eluard
e076690a2f Merge branch 'develop' into element_3969 2021-01-29 11:32:22 +01:00
Gil Eluard
c7f58e0461 Modifications after review 2021-01-28 19:53:20 +01:00
SBiOSoftWhare
e3ca347902 SocialLoginListView: Update social login buttons sorting. 2021-01-28 19:51:59 +01:00
SBiOSoftWhare
9353a82a74 Social login: In SocialLoginButtonFactory handle MXLoginSSOIdentityProvider brand property and handle Gitlab style. 2021-01-28 19:50:33 +01:00
Gil Eluard
22c7a209cc
Update Riot/Modules/Application/LegacyAppDelegate.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-28 14:48:23 +01:00
Gil Eluard
54b354130c
Update Riot/Modules/Application/LegacyAppDelegate.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-28 14:47:12 +01:00
Gil Eluard
dbc1c69f95 Fixed cross-signing detection in LegacyAppDelegate 2021-01-28 11:32:54 +01:00
Gil Eluard
fabef31ac1 reintroduced RoomKeyRequestViewController for the case of the cross signing is not available 2021-01-27 09:38:11 +01:00
Gil Eluard
ccbf29ab84 Avoid megolm share requests if the device is not verified 2021-01-26 17:33:05 +01:00
SBiOSoftWhare
08cd1f156d AuthVC: Fix social login layout issue. 2021-01-22 11:13:25 +01:00
manuroe
c0860e6313
Merge pull request #3954 from vector-im/element_3863
Navigation: BF: Unable to open a room from a room list
2021-01-19 13:33:41 +01:00
manuroe
40d463938c Navigation: BF: Unable to open a room from a room list
Fix #3863

Remove weak because of https://github.com/vector-im/element-ios/issues/3863#issuecomment-762723419
2021-01-19 13:07:25 +01:00
mtoohey31
cfb977e654 Fixed cients spelling mistake 2021-01-16 22:51:37 -05:00
SBiOSoftWhare
3abadd8624 TermsView: Improve rendering. 2021-01-15 17:06:21 +01:00
SBiOSoftWhare
2e547662c5 AuthVC: Fix recaptcha view cropping. 2021-01-15 17:05:45 +01:00
SBiOSoftWhare
c22da15c11
Merge pull request #3930 from vector-im/splitVC_logs
AppCoordinator & SplitViewCoordinator: Add detail navigation logs
2021-01-14 14:56:47 +01:00
manuroe
5df4fe9793 More logs in SplitVC 2021-01-14 14:54:34 +01:00
SBiOSoftWhare
c14c23735c AppCoordinator & SplitViewCoordinator: Add detail navigation logs. 2021-01-14 14:41:39 +01:00
Gil Eluard
274d5968d1 Prevent navigation controller from pushing same view controller 2021-01-14 10:57:12 +01:00
SBiOSoftWhare
1f0079a5c5
Merge pull request #3912 from vector-im/invite_friends 2021-01-13 09:19:11 +01:00
SBiOSoftWhare
86f8ccd659 Invite friends: Update invite friends action wording. 2021-01-12 18:14:52 +01:00
SBiOSoftWhare
251af56b44 Invite friends: Make app name customizable in share text. 2021-01-12 11:34:05 +01:00
SBiOSoftWhare
9ec1065a75 StartChatVC: Add invite friends action. 2021-01-11 18:28:13 +01:00
SBiOSoftWhare
41d9e41296 Add InviteFriendsHeaderView table header view that presents invite friends action. 2021-01-11 18:26:54 +01:00
SBiOSoftWhare
cefe5f9d16 Invite friends: Add action to settings. 2021-01-11 18:26:06 +01:00
SBiOSoftWhare
9a6e84a026 Add InviteFriendsPresenter that enables to share current user contact to someone else. 2021-01-11 18:25:39 +01:00
SBiOSoftWhare
199ec0206e Add CustomRoundedButton: Button to customized from the outside. 2021-01-11 18:22:43 +01:00
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
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
94c355f2d9
Merge branch 'develop' into element_3881 2021-01-11 09:53:32 +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
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
f12fe6c9c3 AuthVC: Do use fallback page when using SSO without idp. 2021-01-07 16:01:17 +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