Commit Graph

68 Commits

Author SHA1 Message Date
Johannes Marbach ce4c8b186c Expand all if and guard constructs involving @available(iOS 14... or #available(iOS 14...
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-06-23 10:05:46 +02:00
SBiOSoftWhare 8d8161b545 RoomCoordinator: Use dedicated UserIndicatorCancel for location sharing. 2022-05-04 16:07:11 +02:00
SBiOSoftWhare ff11b016ed RoomCoordinator: Handle live location viewer and stop sharing. 2022-05-03 16:04:36 +02:00
SBiOSoftWhare 2a4534b4ef RoomCoordinator: Handle live location viewer showing. 2022-04-29 11:08:09 +02:00
yostyle ea453d130f Use autojoin boolean 2022-04-15 14:27:57 +02:00
MaximeE 9fa815cf8f 5982: Apply PR comments 2022-04-12 11:35:17 +02:00
MaximeE 311a5a69e0 Merge branch 'develop' into maximee/5982_ls_static_share_viewer 2022-04-11 17:26:07 +02:00
MaximeE a3758731b9 5982: Clean code and add tests 2022-04-11 10:55:23 +02:00
MaximeE 494f2ee780 5982: Handle access to new screen 2022-04-08 17:44:22 +02:00
MaximeEvrard42 ff78d21755 Merge pull request #5957 from vector-im/maximee/5858_pin_drop_sharing
[Location Sharing]: Pin drop location sharing
2022-04-04 18:04:22 +02:00
MaximeE af9a524273 5858: Modification of the event send according to coordinate type 2022-03-31 16:52:16 +02:00
Andy Uhnak fadfa48f9f Join room loading indicators 2022-03-29 15:03:09 +01:00
SBiOSoftWhare 7e34d777bf RoomCoordinator: Update with new RoomViewControllerDelegate methods. 2022-03-17 16:59:30 +01:00
Gil Eluard 84ed6d9051 Merge branch 'develop' into gil/SP1_space_creation 2022-03-08 13:19:38 +01:00
Andy Uhnak 180ec5ab85 Use split controller's top navigation controller to present toasts 2022-03-08 08:34:45 +00:00
Gil Eluard 59038e18c1 Merge branch 'develop' into gil/SP1_space_creation
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
Andy Uhnak fb022ff6b0 Enable home and room user indicators 2022-03-01 15:50:24 +00:00
Gil Eluard c84285955b SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
Andy Uhnak 4617b3ed69 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Gil Eluard ae27b06f0d Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces 2022-02-05 21:43:29 +01:00
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 f0cef72d73 vector-im/element-ios/issues/5298 - Tweaks following code review. 2022-02-04 11:33:55 +02: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 d2e5e29ad9 Merge branch 'develop' into ismail/5096_thread_notifications 2022-01-27 03:20:25 +03:00
ismailgulek a24e208cb1 Fix review remarks 2022-01-25 23:59:19 +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
ismailgulek 8cee4153e5 Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications 2022-01-19 00:12:40 +03:00
ismailgulek 701d38c798 Merge branch 'develop' into ismail/5068_start_thread 2022-01-19 00:07:52 +03:00
Stefan Ceriu a9a0bd81c8 vector-im/element-ios/issues/5114 - Cleanup + rename PollTimeline to TimelinePoll. 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 23eeedb9ac Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications 2022-01-17 11:39:25 +03:00
ismailgulek a314deb7a1 Merge branch 'develop' into ismail/5068_start_thread 2022-01-17 11:35:10 +03: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
Stefan Ceriu 7161b99d1c vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02: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 37db201124 vector-im/element-ios/issues/5298 - Implemented location sharing from the input toolbar action menu. 2022-01-04 17:33:32 +02:00
ismailgulek bf6c0b16e3 Open thread on an initial event, fetch the event if doesn't exist 2021-12-24 14:50:11 +03:00
Gil Eluard a067a06071 Merge branch 'develop' into gil/5225_invite_to_space_in_room_landing
# Conflicts:
#	Riot/Modules/Room/RoomCoordinator.swift
2021-12-13 15:09:40 +01:00
ismailgulek 1bc9db85c3 Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-12-10 11:08:01 +03:00
ismailgulek 12aa8a1208 Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-12-10 11:07:27 +03:00
ismailgulek 048fa7d98e Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-12-10 11:03:00 +03:00
ismailgulek 3a6e7a19e2 Merge branch 'develop' into ismail/5068_start_thread 2021-12-09 15:25:14 +03:00
Stefan Ceriu ac6561a3d3 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
Gil Eluard c1fa85be6f Invite to Space in room landing #5225
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
ismailgulek 5237963986 Just highlight event when possible instead of reloading data source 2021-11-30 14:13:57 +03:00
ismailgulek 5fb4cc3544 Highlight initial event in the thread view 2021-11-30 00:31:28 +03:00
ismailgulek 2b9a13770b Add threadId to room identification 2021-11-29 18:12:20 +03:00
ismailgulek a003e982e8 Display thread when row tapped 2021-11-19 17:51:40 +03:00
ismailgulek ca55fc047a Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-19 02:17:21 +03:00