Commit Graph

1364 Commits

Author SHA1 Message Date
Gil Eluard f4fa9e97e3 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
#	Riot/Modules/Room/RoomCoordinatorParameters.swift
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
Stefan Ceriu ad7c8dfa1b vector-im/element-ios/issues/5298 - Tweaks following code review. 2022-02-04 11:33:55 +02:00
Stefan Ceriu 40bc43b0f6 vector-im/element-ios/issues/5298 - Add .well-known configuration support for tile server and map styles. 2022-02-04 11:33:55 +02:00
Stefan Ceriu 6839da94d8 vector-im/element-ios/issues/5298 - Reusing location sharing coordinator external sharing logic in the timeline. 2022-02-04 11:33:55 +02:00
aringenbach 7129b4addb Merge pull request #5497 from vector-im/aringenbach/5252_search_results_highlight_color
Display search matching pattern with a highlight color
2022-02-04 10:30:12 +01:00
Gil Eluard db5f9204bd SP1.2: Invite to Space in room landing element-ios#5225
- Update after review
2022-02-03 23:44:07 +01:00
Gil Eluard 1c689eec94 Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/RoomInviteViewController.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 20:59:44 +01:00
Gil Eluard ae08fd7abb Update Riot/Modules/Room/ParticipantsInviteModal/RoomParticipantsInviteModalCoordinatorBridgePresenter.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 20:58:25 +01:00
Gil Eluard ceac4dc971 Update Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/ContactsPickerViewModel.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 20:56:47 +01:00
Doug 53db37b8a3 Fix visual issues when building with Xcode 13. 2022-02-03 18:30:39 +00:00
Arnaud Ringenbach 24c6f890f3 Display search matching pattern with a highlight color
Signed-off-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-03 18:49:40 +01:00
ismailgulek d861506d9f Fix review remarks 2022-02-03 14:25:14 +03:00
ismailgulek 1face7d301 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-03 14:01:21 +03:00
ismailgulek fb4c013730 Add thread setting check to permalinks and search results 2022-02-03 01:40:52 +03:00
Anderas 0fa465f8bd Merge pull request #5484 from vector-im/andy/4524-fix-timeline-scroll
Scroll to the bottom of timeline automatically
2022-02-02 16:03:12 +00:00
Andy Uhnak d5ce90b3d9 Scroll to the bottom of timeline automatically, fixes #4524
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-02 14:58:33 +00:00
ismailgulek e84e78b1e7 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-02 12:46:00 +03:00
Stefan Ceriu 500aba906e De-labs location sharing and enable it by default. 2022-02-02 09:59:45 +02:00
SBiOSoftWhare 22f72fdf28 Merge pull request #5461 from vector-im/steve/5209_media_bubbles_2
Message bubbles: Layout for media (part 2)
2022-02-01 17:52:19 +01:00
SBiOSoftWhare 1f24033fbf BubbleRoomTimelineCellDecorator: Fix typos. 2022-02-01 16:27:43 +01:00
SBiOSoftWhare 2d86f3f772 Update Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-01 15:24:26 +01:00
SBiOSoftWhare cbe34de73b VoiceMessagePlaybackView: Update background view color property name. 2022-02-01 14:49:17 +01:00
SBiOSoftWhare 82e52b5651 FileWithoutThumbnailBaseBubbleCell: Remove useless method. 2022-02-01 14:24:12 +01:00
SBiOSoftWhare 072d80ab75 BubbleRoomTimelineCellDecorator: Update a guard let indentation. 2022-02-01 14:23:33 +01:00
SBiOSoftWhare a1fcf51812 Flip cellData.isIncoming usage. 2022-02-01 14:22:05 +01:00
SBiOSoftWhare 2f8929e3e7 FileWithoutThumbnailBaseBubbleCell: Fix nullability crash. 2022-02-01 11:54:03 +01:00
SBiOSoftWhare ff4be933cf Update file without thumbnail cell content view layout. 2022-01-31 17:49:38 +01:00
SBiOSoftWhare abec1a6771 Message bubbles: Use new background colors. 2022-01-31 17:42:54 +01:00
SBiOSoftWhare 640c3d21b9 BubbleRoomTimelineCellDecorator: Handle timestamp for stickers. 2022-01-31 17:13:20 +01:00
SBiOSoftWhare 52aa9e4ce2 BubbleRoomCellLayoutUpdater: Fix incoming selected sticker cell. 2022-01-31 14:40:17 +01:00
SBiOSoftWhare 68994a1449 RoomSelectedStickerBubbleCell: Handle bubble outgoing case. 2022-01-31 12:11:36 +01:00
SBiOSoftWhare 19221cdd91 PollBubbleCell: Fix method override. 2022-01-31 10:56:02 +01:00
SBiOSoftWhare 68c3c6cbaf BubbleRoomTimelineCellDecorator: Handle file without thumbnail cells timestamp. 2022-01-31 10:55:40 +01:00
SBiOSoftWhare 4b4099fefa BubbleRoomTimelineCellProvider: Handle file without thumbnail cells. 2022-01-31 10:55:03 +01:00
SBiOSoftWhare 168b3d8d26 Create file without thumbnail outgoing cells. 2022-01-31 10:53:29 +01:00
SBiOSoftWhare 0a24209c33 Create file without thumbnail iincoming cells. 2022-01-31 10:51:50 +01:00
SBiOSoftWhare 4bf6ccee0e Create file without thumbnail content cell and base cell. 2022-01-31 10:51:04 +01:00
SBiOSoftWhare 5e11c6c6c8 RoomViewController: Handle file without thumbnail cell identifiers. 2022-01-31 10:48:35 +01:00
SBiOSoftWhare 93f9ea598e PlainRoomTimelineCellProvider: Handle file without thumbnail cell mapping. 2022-01-31 10:47:55 +01:00
SBiOSoftWhare 277a6d85e6 RoomTimelineCellIdentifier: Add identifiers for file without thumbnail cells. 2022-01-31 10:46:46 +01:00
SBiOSoftWhare bd7c0f19db MXKRoomBubbleTableViewCell: Expose onContentViewTap method. 2022-01-31 10:45:15 +01:00
SBiOSoftWhare 82f236b01c Update MXKRoomBubbleTableViewCell. 2022-01-31 10:41:44 +01:00
SBiOSoftWhare cd987cd10e BubbleRoomTimelineCellDecorator: Handle voice message timestamp. 2022-01-28 14:40:02 +01:00
SBiOSoftWhare 2b3e952163 VoiceMessage bubble cells: Add extra space for timestamp. 2022-01-28 14:38:49 +01:00
SBiOSoftWhare 77a31faa71 VoiceMessagePlaybackView: Expose stackViewTrailingContraint. 2022-01-28 14:32:43 +01:00
ismailgulek c07c90052b Fix tapping on user avatar 2022-01-28 01:51:55 +03:00
Gil Eluard e799b65ab4 SP1.2: Invite to Space in room landing element-ios#5225
- update after design review
2022-01-27 14:34:03 +01:00
ismailgulek 2ceaccf252 Fix redundant check 2022-01-27 03:28:22 +03:00
ismailgulek a13d5704dc Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek a79e1ec003 Fix further review remarks 2022-01-27 02:16:30 +03:00