Commit graph

12363 commits

Author SHA1 Message Date
David Langley
87e84d2f6c Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4774_voice_message_scrubbing 2021-09-22 13:17:32 +01:00
David Langley
f87c28318d Simplify scrubbing and reset to stopped if scrub to start/end 2021-09-22 11:12:45 +01:00
David Langley
d3fb3a7e40
Merge pull request #4876 from vector-im/langleyd/4773_pause_resume_voice_messages
Add Pause/Resume support between rooms.
2021-09-22 09:38:35 +00:00
David Langley
87cd6fa209 Add scrubbing 2021-09-22 09:36:20 +01:00
Stefan Ceriu
6abdcb9e93 Fix #4415 - Added back section header when only PIN available. 2021-09-22 08:44:48 +03:00
Stefan Ceriu
1f87204123 Fix #4415 - Cannot disable Face ID after disabling pin. Fixed security vc cell tags comparisons. 2021-09-22 08:44:48 +03:00
Stefan Ceriu
9f486fa1fb Fix #4461 - "PIN & (NULL)" when device biometrics not available (or not enrolled). 2021-09-22 08:44:48 +03:00
Stefan Ceriu
55d4b68e96 Don't invoke biometrics setup after chaning the pin if already set up. 2021-09-22 08:44:48 +03:00
David Langley
1ddd420781 Add Pause/Resume support between rooms. 2021-09-21 15:52:53 +01:00
Stefan Ceriu
abb3259608 Fixes #4830 - Automatically dismissing invites for empty rooms after failing to join. 2021-09-21 16:28:48 +03:00
Stefan Ceriu
f339db231a Fixes #4843 - Prevent home screen horizontal scroll views from capturing side menu swipe gestures. 2021-09-17 17:58:44 +03:00
SBiOSoftWhare
521d75e5b7
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
bdecdfb518 RoomVC: Fix comment mistake. 2021-09-17 14:21:27 +02:00
SBiOSoftWhare
f8e9d15a4a RoomVC: Remove unnecessary nonnull. 2021-09-17 14:19:38 +02:00
SBiOSoftWhare
5859647ddf
Update Riot/Modules/Room/RoomViewController.h
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-09-17 13:21:53 +02:00
Doug
e1f6113655
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
84bdfb31c7 Update setting string. 2021-09-16 17:57:36 +01:00
Doug
8510027fbf
Merge pull request #4856 from vector-im/doug/4855_fix_url_preview_width
Fix URL preview width on 4" devices
2021-09-16 17:54:34 +01:00
Doug
96ef61ab21 Enable URL Previews by default and remove from Labs. 2021-09-16 17:51:56 +01:00
Doug
d956fb9b59 Update Podfile.lock for OLMKit 3.2.5 2021-09-16 17:24:04 +01:00
Doug
7807b21e09 Use constants. 2021-09-16 17:13:56 +01:00
Doug
9baa8c73dc Add changelog entry. 2021-09-16 16:42:11 +01:00
Doug
38db80ac6b Reduce the width of URL previews on 4" devices. 2021-09-16 16:41:21 +01:00
manuroe
e1d5a33c8e Prepare for new sprint 2021-09-16 15:02:49 +02:00
manuroe
77fc814221 Merge remote-tracking branch 'origin/master' into develop 2021-09-16 15:01:40 +02:00
manuroe
bdb607c259 Merge branch 'release/1.5.4/master' 2021-09-16 14:59:17 +02:00
manuroe
b3c4f6b45b finish version++ 2021-09-16 14:59:17 +02:00
manuroe
3b520736ff
Merge pull request #4854 from vector-im/release/1.5.4/release
Release 1.5.4
2021-09-16 14:58:40 +02:00
manuroe
56711bf5e3 Fastlane: Make point_dependencies_to_pending_releases default to master
if there is no  pending release branch.
This is not great. The build cannot be reproducible but it is better than using develop
2021-09-16 14:24:20 +02:00
manuroe
2924ada91c version++ 2021-09-16 13:49:44 +02:00
manuroe
7a735f8714 changelog.d: Upgrade MatrixKit version ([v0.16.1](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.1)). 2021-09-16 13:49:43 +02:00
David Langley
18c4cf0b65
Merge pull request #4837 from vector-im/langleyd/4835_fix_swiftui_theme_after_restart
SwiftUI theme not set correctly after re-launch of the app.
2021-09-15 16:45:41 +00:00
David Langley
3f32956776 parameter not used in ThemePublisher.configure 2021-09-15 17:12:56 +01:00
Stefan Ceriu
d4c7a2b0d1 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
SBiOSoftWhare
2abaff826e
Merge pull request #4817 from pengufrost/4785_fix_sso_redirect 2021-09-14 08:43:16 +02:00
Chelsea Finnie
59220d79d1 Updated SSOAuthenticationService.swift to append / to redirect path if using an identity provider 2021-09-14 10:57:35 +12:00
Doug
04aa924792
Merge pull request #4825 from vector-im/doug/4823_fix_url_preview_crash
Ensure the last bubble component has a link before loading the preview.
2021-09-13 18:21:54 +01:00
Doug
721e5daa23 Override hasLink in RoomBubbleCellData to only check the last component. 2021-09-13 17:47:52 +01:00
Doug
2b11d4d325 Ensure the last bubble component has a link before loading the URL preview. 2021-09-13 16:49:34 +01:00
David Langley
2b79f46b0f
Merge pull request #4818 from vector-im/langleyd/4816_fix_swiftui_theme_updates
Fix SwiftUI theme updates
2021-09-10 12:19:23 +01:00
David Langley
7f21f86c81 Create 4816.bugfix 2021-09-10 11:18:26 +01:00
David Langley
5f3ddf60ec Always get the identifier from the theme. 2021-09-10 11:14:42 +01:00
David Langley
0ac0c2a230 get theme id from theme, always republish theme updates. 2021-09-10 10:54:50 +01:00
Chelsea Finnie
af2d3a5bde 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
SBiOSoftWhare
353cb425b2 Merge branch 'develop' into steve/4734_nav_room_stack
# Conflicts:
#	Riot/Modules/Room/RoomViewController.m
2021-09-09 16:45:35 +02:00
manuroe
453b8d414c Prepare for new sprint 2021-09-09 11:13:37 +02:00
manuroe
58d2fd0707 Merge branch 'master' into develop 2021-09-09 11:13:35 +02:00
manuroe
094b05fd5e Merge branch 'release/1.5.3/master' 2021-09-09 11:13:31 +02:00
manuroe
ae46e206f0 finish version++ 2021-09-09 11:13:31 +02:00
manuroe
a1fe1ca64c
Merge pull request #4811 from vector-im/release/1.5.3/release
Release 1.5.3
2021-09-09 11:05:07 +02:00