Commit Graph

4423 Commits

Author SHA1 Message Date
Stefan Ceriu b4d51ab4ba Don't invoke biometrics setup after chaning the pin if already set up. 2021-09-22 08:44:48 +03:00
David Langley 82bcd8ce79 Add Pause/Resume support between rooms. 2021-09-21 15:52:53 +01:00
Stefan Ceriu 8c7076d5f5 Fixes #4830 - Automatically dismissing invites for empty rooms after failing to join. 2021-09-21 16:28:48 +03:00
Gil Eluard 5864f2a55f Merge branch 'spaces' into gil/pre_release_fixes 2021-09-20 10:18:59 +02:00
Gil Eluard ca83d8258f Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
Gil Eluard d879928a96 [spaces] several fixes for pre release
- [Space home view inherits title from previously viewed tab](https://github.com/vector-im/element-ios/issues/4851)
- [Home view doesn't refresh when new rooms are created](https://github.com/vector-im/element-ios/issues/4849)
- [Odd error message in Space member list](https://github.com/vector-im/element-ios/issues/4845)
- [Bring leaving space experience in line with Web](https://github.com/vector-im/element-ios/issues/4850)
- [No notification for space invitation](https://github.com/vector-im/element-ios/issues/4840)
- [Remove filter when space is switched](https://github.com/vector-im/element-ios/issues/4852)
- [M10.11 Remove community tab](https://github.com/vector-im/element-ios/issues/4493)
2021-09-20 10:10:27 +02:00
David Langley a94969403c Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-20 08:50:38 +01:00
Stefan Ceriu 161f8ba217 Fixes #4843 - Prevent home screen horizontal scroll views from capturing side menu swipe gestures. 2021-09-17 17:58:44 +03:00
SBiOSoftWhare 3e8dc6dfa8 Merge pull request #4814 from vector-im/steve/4734_room_vc_refacto
RoomVC: Add a delegate, factorize and reduce usage of AppDelegate
2021-09-17 15:58:05 +02:00
SBiOSoftWhare 996f61d367 RoomVC: Fix comment mistake. 2021-09-17 14:21:27 +02:00
SBiOSoftWhare 649aab5774 RoomVC: Remove unnecessary nonnull. 2021-09-17 14:19:38 +02:00
SBiOSoftWhare 695b51e180 Update Riot/Modules/Room/RoomViewController.h
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-09-17 13:21:53 +02:00
Doug a36c86a2ac Merge pull request #4857 from vector-im/doug/4828_enable_url_previews
Enable URL Previews by default and remove from Labs.
2021-09-16 22:23:09 +01:00
Doug 6a92f89feb Enable URL Previews by default and remove from Labs. 2021-09-16 17:51:56 +01:00
Doug 74277d73a9 Use constants. 2021-09-16 17:13:56 +01:00
Doug 63d822b026 Reduce the width of URL previews on 4" devices. 2021-09-16 16:41:21 +01:00
Gil Eluard 2e822f8784 Merge branch 'develop' into spaces 2021-09-16 15:47:32 +02:00
manuroe b6f26a258c Merge remote-tracking branch 'origin/master' into develop 2021-09-16 15:01:40 +02:00
Doug 54ddde336c Fix landscape layout of ServiceTermsModalScreenViewController. 2021-09-16 13:08:21 +01:00
David Langley d189c4d618 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/4781_swiftui_template_examples 2021-09-15 14:33:05 +01:00
Doug fa320d26c7 Improve layout of ServiceTermsModalScreenViewController on 4" devices. 2021-09-15 14:02:36 +01:00
Gil Eluard 9279d17226 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
Doug 4c2bd8ee76 Add ServiceTermsModalTableHeaderView to ServiceTermsModalScreenViewController. 2021-09-15 11:53:30 +01:00
Doug 15a7ded4d6 Fix FindYourContactsFooterView layout on 4" screens. 2021-09-15 10:28:45 +01:00
Gil Eluard 7d1d864edb [Spaces] M10.6 Space preview bottom sheet #4497
- Update after code review
2021-09-15 11:16:20 +02:00
Doug 8ea77dd2cf Rename RequestContactsAccessFooterView to FindYourContactsFooterView. 2021-09-15 10:03:32 +01:00
Doug 11fa6a9f7b Fix rotation layout bug. Update button title. 2021-09-14 17:22:28 +01:00
Gil Eluard 53ae49b199 Merge branch 'spaces' into gil/4497_space_preview_bottom_sheet
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-09-14 17:53:46 +02:00
Gil Eluard 0da7d70b21 [Spaces] M10.8 Browsing users in a space #4682
- Fixed build issue on Jenkins
2021-09-14 17:22:48 +02:00
Gil Eluard 5f8de45e25 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Doug e0bda2360b Call -MXKContactManager.validateSyncLocalContactsState when the app is launched. 2021-09-14 14:49:07 +01:00
Gil Eluard 99cbeab6f3 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 15:29:16 +02:00
Gil Eluard de09af397f [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 11:45:33 +02:00
Stefan Ceriu 62cdb29331 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
Gil Eluard bc0c7f36aa [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +02:00
SBiOSoftWhare 6cbebdf22b Merge pull request #4817 from pengufrost/4785_fix_sso_redirect 2021-09-14 08:43:16 +02:00
Chelsea Finnie 2b48ba3c29 Updated SSOAuthenticationService.swift to append / to redirect path if using an identity provider 2021-09-14 10:57:35 +12:00
Doug 4910ef37ee Override hasLink in RoomBubbleCellData to only check the last component. 2021-09-13 17:47:52 +01:00
Doug 9029aaecda Ensure the last bubble component has a link before loading the URL preview. 2021-09-13 16:49:34 +01:00
Gil Eluard ee0deb258e [Spaces] M10.8 Browsing users in a space #4682
- Update after design review
2021-09-13 16:03:56 +02:00
Doug 806c6d3677 Show an activity indicator whilst preparing the identity service. Show an alert when there's an error. 2021-09-13 14:25:54 +01:00
Doug c1ad2e9ece Update the Service Terms modal from the latest Figma.
Checkboxes have been removed from the individual policies.
Reverse flow so that the service terms are show before the contacts access popup.
Removes outOfContext from the modal as it will only be presented when requested.
Fixes second presentation on swipe to dismiss of the modal.
2021-09-13 11:46:31 +01:00
Gil Eluard eaeed470a9 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-09-13 10:23:21 +02:00
Gil Eluard e1118b1f57 [Spaces] M10.7 Explore rooms #4571
- Update after code review
2021-09-13 10:06:36 +02:00
David Langley 0d241ddf84 Always get the identifier from the theme. 2021-09-10 11:14:42 +01:00
David Langley 869c45c11f get theme id from theme, always republish theme updates. 2021-09-10 10:54:50 +01:00
Chelsea Finnie 4b74143460 Fix redirection issue when logging in with single sign on. Fixes #4785.
Signed-off-by: Chelsea Finnie <chelseafinnie@catalyst.net.nz>
2021-09-10 15:14:38 +12:00
David Langley 59a54654b1 Add configurable logger for RiotSwiftUI 2021-09-09 22:42:00 +01:00
SBiOSoftWhare 787f78bb82 Merge branch 'develop' into steve/4734_nav_room_stack
# Conflicts:
#	Riot/Modules/Room/RoomViewController.m
2021-09-09 16:45:35 +02:00
Doug 29400b7b19 Update strings in SettingsViewController. 2021-09-09 15:17:29 +01:00