Commit Graph

4556 Commits

Author SHA1 Message Date
manuroe c838f58229 Merge remote-tracking branch 'origin/master' into develop 2021-09-16 15:01:40 +02:00
Doug b71c16fc17 Fix landscape layout of ServiceTermsModalScreenViewController. 2021-09-16 13:08:21 +01:00
David Langley 9724bfe8e8 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 ab38cd4192 Improve layout of ServiceTermsModalScreenViewController on 4" devices. 2021-09-15 14:02:36 +01:00
Gil Eluard 068f4b3ce0 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 a9603a46ce Add ServiceTermsModalTableHeaderView to ServiceTermsModalScreenViewController. 2021-09-15 11:53:30 +01:00
Doug 552d5df7bd Fix FindYourContactsFooterView layout on 4" screens. 2021-09-15 10:28:45 +01:00
Gil Eluard dd510bdc2b [Spaces] M10.6 Space preview bottom sheet #4497
- Update after code review
2021-09-15 11:16:20 +02:00
Doug 773e9e8161 Rename RequestContactsAccessFooterView to FindYourContactsFooterView. 2021-09-15 10:03:32 +01:00
Doug a2c9621b85 Fix rotation layout bug. Update button title. 2021-09-14 17:22:28 +01:00
Gil Eluard abe131ecc8 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 c54df612db [Spaces] M10.8 Browsing users in a space #4682
- Fixed build issue on Jenkins
2021-09-14 17:22:48 +02:00
Gil Eluard d3da21f1d7 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 16:59:32 +02:00
Doug 017a0e2b64 Call -MXKContactManager.validateSyncLocalContactsState when the app is launched. 2021-09-14 14:49:07 +01:00
Gil Eluard c38c2e3f51 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 15:29:16 +02:00
Gil Eluard 1a74f75952 [Spaces] M10.8 Browsing users in a space #4682
- Update after code review
2021-09-14 11:45:33 +02:00
Stefan Ceriu f1d3e5af9d Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
Gil Eluard 4b058ee154 [Spaces] M10.6 Space preview bottom sheet #4497
- Update after design review
2021-09-14 09:42:10 +02:00
SBiOSoftWhare 073d4e3994 Merge pull request #4817 from pengufrost/4785_fix_sso_redirect 2021-09-14 08:43:16 +02:00
Chelsea Finnie 85a3f3a26d Updated SSOAuthenticationService.swift to append / to redirect path if using an identity provider 2021-09-14 10:57:35 +12:00
Doug 399b196395 Override hasLink in RoomBubbleCellData to only check the last component. 2021-09-13 17:47:52 +01:00
Doug fc8de451d0 Ensure the last bubble component has a link before loading the URL preview. 2021-09-13 16:49:34 +01:00
Gil Eluard d6ff487def [Spaces] M10.8 Browsing users in a space #4682
- Update after design review
2021-09-13 16:03:56 +02:00
Doug 466cdbb0da 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 fc427b5490 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 10c6c883e6 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 8e18533ee3 [Spaces] M10.7 Explore rooms #4571
- Update after code review
2021-09-13 10:06:36 +02:00
David Langley 56d5c40c74 Always get the identifier from the theme. 2021-09-10 11:14:42 +01:00
David Langley 27eb881bb1 get theme id from theme, always republish theme updates. 2021-09-10 10:54:50 +01:00
Chelsea Finnie 5d84d364dd 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 8c9a00b688 Add configurable logger for RiotSwiftUI 2021-09-09 22:42:00 +01:00
SBiOSoftWhare 559462003b Merge branch 'develop' into steve/4734_nav_room_stack
# Conflicts:
#	Riot/Modules/Room/RoomViewController.m
2021-09-09 16:45:35 +02:00
Doug 010202dad2 Update strings in SettingsViewController. 2021-09-09 15:17:29 +01:00
Doug 75b8de803b Revert search bar placeholder. 2021-09-09 14:41:03 +01:00
Doug 7fdb992aec Update strings and add localise. Use theme v2. 2021-09-09 13:08:50 +01:00
Doug d02a4fe779 Merge branch 'develop' into doug/4484_contacts_access 2021-09-09 12:24:08 +01:00
Doug 06d2c41638 Merge pull request #4790 from vector-im/doug/888_add_url_previews
Add URL previews as a Labs feature
2021-09-08 17:19:41 +01:00
Doug 56f53733c8 Revert height computation for now. 2021-09-08 15:59:30 +01:00
David Langley 20bc4f5494 CoordinatorParamters, Type -> Protocol, remove MX Prefix. 2021-09-08 15:47:24 +01:00
Doug 4a33f7f1e6 Update for PR feedback.
URLPreviewManager becomes URLPreviewService.
addVerticalWhitespaceToString used instead of heightForCellData multiple times.
All newline characters removed.
2021-09-08 15:10:13 +01:00
ismailgulek d945f5fead Remove forgotten Jitsi call property and function 2021-09-08 14:07:19 +03:00
ismailgulek 55578481ff Wait for sync response when clearing cache 2021-09-08 14:06:41 +03:00
ismailgulek 8faba8cf5a Post data ready notification every time 2021-09-08 13:54:08 +03:00
ismailgulek 1e897e39b8 Merge pull request #4798 from vector-im/ismail/4797_launch_empty_screen
Show animation instead of empty screen on app launch
2021-09-08 12:24:53 +03:00
Doug 5acbc20fc9 Add more docs and comments.
Rename store.store(_:) to store.cache(_:).
2021-09-08 09:51:47 +01:00
ismailgulek 0df5b2b03a Listen for recents data ready notification in an async method 2021-09-08 11:21:04 +03:00
ismailgulek 2b8b37a0e1 Move data ready notification to RecentsViewController 2021-09-08 11:18:18 +03:00
David Langley 372da7cdde Remove unneeded protocol and methods on VectortHostingController 2021-09-07 22:49:11 +01:00
ismailgulek b8fe8856a8 Fix search bar clipping issues 2021-09-08 00:29:28 +03:00
Doug 75a9a19421 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00