Commit Graph

1001 Commits

Author SHA1 Message Date
David Langley 625534a7a3 Remove space 2021-09-23 09:39:09 +01:00
David Langley 350fc0fe30 Use RoomId for room by room drafts. 2021-09-23 08:48:15 +01:00
David Langley fb5b1b28e9 Simplify scrubbing logic. 2021-09-22 16:26:20 +01:00
Gil Eluard 6044ea45f5 Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00
Stefan Ceriu fc3e70891a Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings
# Conflicts:
#	Riot/Generated/Strings.swift
2021-09-22 17:17:05 +03:00
Stefan Ceriu b41cd1e1a4 Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Gil Eluard 4068c1a55f Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-09-22 15:39:06 +02:00
Gil Eluard 3db7e10c15 [Spaces] M10.6.1 Handle space link #4498
- Fixed universal links
- Added support for space links
2021-09-22 14:58:19 +02:00
David Langley 80f407857f Build on xcode 12 2021-09-22 13:53:26 +01:00
David Langley 928e4e1cc3 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4774_voice_message_scrubbing 2021-09-22 13:17:32 +01:00
Stefan Ceriu cc8b6a8d75 Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00
David Langley d0ca7fa921 Simplify scrubbing and reset to stopped if scrub to start/end 2021-09-22 11:12:45 +01:00
David Langley 5a91047f7e 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 46f31830ca Add scrubbing 2021-09-22 09:36:20 +01:00
David Langley 6e642c4374 Add Pause/Resume support between rooms. 2021-09-21 15:52:53 +01:00
Stefan Ceriu 9a12590dc3 Fixes #4830 - Automatically dismissing invites for empty rooms after failing to join. 2021-09-21 16:28:48 +03:00
Gil Eluard d6b824c54f Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
SBiOSoftWhare 46b7dd67a9 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 2eb8b06b07 RoomVC: Fix comment mistake. 2021-09-17 14:21:27 +02:00
SBiOSoftWhare 73ea384cd0 RoomVC: Remove unnecessary nonnull. 2021-09-17 14:19:38 +02:00
SBiOSoftWhare 670e5f0198 Update Riot/Modules/Room/RoomViewController.h
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-09-17 13:21:53 +02:00
Doug f644eaec8a Use constants. 2021-09-16 17:13:56 +01:00
Doug e2a0b5fc23 Reduce the width of URL previews on 4" devices. 2021-09-16 16:41:21 +01:00
Gil Eluard 55005a91ed Merge branch 'develop' into spaces 2021-09-16 15:47:32 +02:00
manuroe 6724ee9a2f Merge remote-tracking branch 'origin/master' into develop 2021-09-16 15:01:40 +02:00
Gil Eluard 6335acc0cd 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
Stefan Ceriu ee417c21d8 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
Doug c9e522dfd7 Override hasLink in RoomBubbleCellData to only check the last component. 2021-09-13 17:47:52 +01:00
Doug 83b8148ab5 Ensure the last bubble component has a link before loading the URL preview. 2021-09-13 16:49:34 +01:00
SBiOSoftWhare ee7f6b52f7 Merge branch 'develop' into steve/4734_nav_room_stack
# Conflicts:
#	Riot/Modules/Room/RoomViewController.m
2021-09-09 16:45:35 +02:00
Doug b7ed2d6d58 Revert height computation for now. 2021-09-08 15:59:30 +01:00
Doug ecf9503dc9 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
Doug a8675e8f27 Add more docs and comments.
Rename store.store(_:) to store.cache(_:).
2021-09-08 09:51:47 +01:00
Doug f92fae96d0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
SBiOSoftWhare 4dc4d8fb0e RoomVC: Add a delegate, factorize and reduce usage of AppDelegate. 2021-09-07 17:43:49 +02:00
Doug f9a656c74d Remove "Loading preview..." label. 2021-09-07 16:12:12 +01:00
Doug f604049083 Fix unsatisfiable constraints messages. 2021-09-07 14:49:51 +01:00
Doug babbdff05a Observe URL preview update notification in RoomViewController.
Update bubbleTableView's content offset when a preview above the bottom most visible cell changes the height of the table's content.
2021-09-07 14:49:51 +01:00
Doug e04bbb776d Add MediaCompressionHelper.defaultCompressionMode for use in RoomViewController. 2021-09-07 14:46:02 +01:00
Doug f2da5aa470 Add comments. 2021-09-06 18:15:55 +01:00
Doug f6fdb42ff3 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-09-06 17:04:22 +01:00
Stefan Ceriu 7d6a1cac40 Revert "#4693 - Drop iOS 11 support."
This reverts commit a2b359f21960e1b9f75139d94adc7aeb35fa479f.
2021-09-06 18:24:26 +03:00
Doug 042fa4197d Fix potentially redundant table reloading. 2021-09-03 18:18:36 +01:00
Doug 891c901599 Fix reactions beneath URL previews. 2021-09-03 12:07:29 +01:00
Doug 8592a36ec6 Break-up cell data after a link even if the new event isn't a message. 2021-09-03 11:52:57 +01:00
Doug caf0a5264d Hide the loading state on error. 2021-09-03 11:32:09 +01:00
Doug ebb9fd1566 Fix edits to previewable links not working. 2021-09-03 11:21:07 +01:00
Doug ef65feb3de Add setting to disable URL previews.
Using a temporary position in the settings screen whilst waiting for feedback.
2021-09-03 10:19:26 +01:00
Doug 8f8322a94c Ensure correct font is used. 2021-09-02 18:08:35 +01:00
Doug f8bc972ff8 Merge remote-tracking branch 'origin/develop' into doug/888_add_url_previews 2021-09-02 17:39:42 +01:00