Commit Graph

593 Commits

Author SHA1 Message Date
Gil Eluard 0ae38858da 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 a1560bfbe5 vector-im/element-ios/issues/5298 - Reusing location sharing coordinator external sharing logic in the timeline. 2022-02-04 11:33:55 +02:00
ismailgulek 2a95516545 Fix review remarks 2022-02-03 14:25:14 +03:00
ismailgulek 4cf78a2bf1 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-03 14:01:21 +03:00
SBiOSoftWhare a85052bf67 RoomVC: Handle poll cell identifiers. 2022-02-03 09:56:59 +01:00
Anderas 14740da952 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 2605550927 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 95db348bdc Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-02 12:46:00 +03:00
Stefan Ceriu a3c6fc56c6 De-labs location sharing and enable it by default. 2022-02-02 09:59:45 +02:00
SBiOSoftWhare a1cf7b9b7c 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 a3f3d874f3 RoomViewController: Handle file without thumbnail cell identifiers. 2022-01-31 10:48:35 +01:00
ismailgulek d2e5e29ad9 Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek b3362c05d4 Make remove poll action destructive as well 2022-01-26 16:03:17 +03:00
ismailgulek d79af0e26d Fix Doug's remarks 2022-01-26 15:58:37 +03:00
ismailgulek d71b9ed645 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-26 14:27:25 +03:00
ismailgulek a24e208cb1 Fix review remarks 2022-01-25 23:59:19 +03:00
SBiOSoftWhare c09fcded0a RoomVC: Handle new voice location cell identifiers. 2022-01-25 16:43:21 +01:00
SBiOSoftWhare a755321fee RoomVC: Handle new voice message cell identifiers. 2022-01-25 14:53:53 +01:00
ismailgulek 6ac01ae245 Merge branch 'develop' into ismail/5068_start_thread 2022-01-25 14:30:52 +03:00
Gil Eluard b9512352a6 Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
2022-01-24 19:36:02 +01:00
SBiOSoftWhare 535af1caf3 Merge pull request #5383 from vector-im/steve/5208_text_msg_layout
Message bubbles: Text message layout
2022-01-21 16:06:57 +01:00
ismailgulek 5c653b5346 Implement going back to live room data sources for threads, fix bugs around it 2022-01-21 01:56:51 +03:00
ismailgulek d22a8d5862 Scroll to highlighted event better 2022-01-21 00:59:01 +03:00
SBiOSoftWhare 8f3c47a321 Refactor RoomTimelineCellProviderProtocol to RoomTimelineCellProvider. 2022-01-20 17:09:34 +01:00
David Langley d3699e730e Merge pull request #5400 from vector-im/langleyd/5399_fix_crash_uploading_video_ipad
Fix crash uploading video ipad
2022-01-19 09:19:25 +00:00
David Langley 6c9f11f6c5 Specify source of alertView popup for selecting video/image size on upload 2022-01-18 21:35:53 +00:00
ismailgulek 8cee4153e5 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 83948f113f Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-19 00:09:26 +03:00
ismailgulek 701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu f3422613cd vector-im/element-ios/issues/5114 - De-labs-ed polls, disabled editing and undisclosed polls until platform parity. 2022-01-18 20:05:10 +02:00
Stefan Ceriu 0980804213 vector-im/element-ios/issues/5114 - Allow editing poll start events. 2022-01-18 20:05:10 +02:00
ismailgulek f3247d6396 Disable sending polls in threads 2022-01-18 16:32:23 +03:00
ismailgulek 7af7bd12e7 Dismiss keyboard when additional menu shown 2022-01-18 02:27:44 +03:00
ismailgulek fb643ed8c0 Various design fixes 2022-01-17 16:32:32 +03:00
ismailgulek 812b58592e Fix build after merges 2022-01-17 13:35:14 +03:00
ismailgulek 23eeedb9ac Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek 630f121546 Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks 2022-01-17 11:37:41 +03:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03:00
SBiOSoftWhare de0163cf65 RoomVC: Handle cell provider. 2022-01-14 10:23:15 +01:00
Gil Eluard f7ac4ee17d Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
2022-01-13 16:30:55 +01:00
Gil Eluard 086afb1835 SP3.1: Update room settings for Spaces element-ios#5231
- Changed the Room Settings screen according to the new design
- Implemented the room access flow
- Added room upgrade support
- Implemented the room suggestion screen
2022-01-13 15:53:45 +01:00
ismailgulek cc343af766 Remove old code 2022-01-12 14:46:54 +03:00
ismailgulek 7cb920e582 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-12 13:58:48 +03:00
ismailgulek 1a82945d87 Add EventMenuBuilder to manage ordering on event menu actions 2022-01-10 17:31:28 +03:00
ismailgulek 4903e69fc3 Fix context menu action orders & layout fixes 2022-01-06 03:22:14 +03:00
ismailgulek addb8bf722 Implement toast messages when links are copied 2022-01-06 02:41:57 +03:00
Stefan Ceriu 2ef67f3ed2 vector-im/element-ios/issues/5298 - Displaying a modal when tapping on a location in the timeline. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 17f9639173 vector-im/element-ios/issues/5298 - Disable forwarding for location messages and allow replies. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 37db201124 vector-im/element-ios/issues/5298 - Implemented location sharing from the input toolbar action menu. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 9c66b5b7b1 vector-im/element-ios/issues/5298 - Replaced "msgtype" strings with new kMXMessageTypeKey. 2022-01-04 17:33:32 +02:00