MaximeEvrard42
a11a153c1a
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
2133bb44bb
5858: Modification of the event send according to coordinate type
2022-03-31 16:52:16 +02:00
Andy Uhnak
1b24371337
Join room loading indicators
2022-03-29 15:03:09 +01:00
SBiOSoftWhare
b26b87e421
RoomCoordinator: Update with new RoomViewControllerDelegate methods.
2022-03-17 16:59:30 +01:00
Gil Eluard
5229264d21
Merge branch 'develop' into gil/SP1_space_creation
2022-03-08 13:19:38 +01:00
Andy Uhnak
eef9802e96
Use split controller's top navigation controller to present toasts
2022-03-08 08:34:45 +00:00
Gil Eluard
42b4144323
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
830feeb7c0
Enable home and room user indicators
2022-03-01 15:50:24 +00:00
Gil Eluard
bca69bb7c8
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
Andy Uhnak
559bb88ae4
Room user indicators
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-25 10:47:53 +00:00
Gil Eluard
fd765a9288
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
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
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
ismailgulek
a13d5704dc
Merge branch 'develop' into ismail/5096_thread_notifications
2022-01-27 03:20:25 +03:00
ismailgulek
f7694e27cb
Fix review remarks
2022-01-25 23:59:19 +03:00
Gil Eluard
d23f24b9ce
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
81405b4dd6
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications
2022-01-19 00:12:40 +03:00
ismailgulek
3e2c4b32b0
Merge branch 'develop' into ismail/5068_start_thread
2022-01-19 00:07:52 +03:00
Stefan Ceriu
5dfea75d58
vector-im/element-ios/issues/5114 - Cleanup + rename PollTimeline to TimelinePoll.
2022-01-18 20:05:10 +02:00
Stefan Ceriu
b18f37d270
vector-im/element-ios/issues/5114 - Allow editing poll start events.
2022-01-18 20:05:10 +02:00
ismailgulek
26a6060e3e
Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications
2022-01-17 11:39:25 +03:00
ismailgulek
7e92b7cef5
Merge branch 'develop' into ismail/5068_start_thread
2022-01-17 11:35:10 +03:00
Gil Eluard
b4eee99d03
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
ea9183d70e
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
49c787d987
vector-im/element-ios/issues/5298 - Various tweaks following code review.
2022-01-04 17:33:32 +02:00
Stefan Ceriu
ebac08c309
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
4ad5150c88
vector-im/element-ios/issues/5298 - Implemented location sharing from the input toolbar action menu.
2022-01-04 17:33:32 +02:00
ismailgulek
1d7db8a266
Open thread on an initial event, fetch the event if doesn't exist
2021-12-24 14:50:11 +03:00
Gil Eluard
2a09ca3947
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
ffd7efbe2a
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links
2021-12-10 11:08:01 +03:00
ismailgulek
867c4dac7c
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list
2021-12-10 11:07:27 +03:00
ismailgulek
d1b7953da6
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-12-10 11:03:00 +03:00
ismailgulek
8093844aea
Merge branch 'develop' into ismail/5068_start_thread
2021-12-09 15:25:14 +03:00
Stefan Ceriu
17f2f71634
vector-im/element-ios/issues/5114 - Polls in the timeline.
2021-12-09 09:37:02 +02:00
Gil Eluard
72ba8e6719
Invite to Space in room landing #5225
...
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
ismailgulek
f6e1129d16
Just highlight event when possible instead of reloading data source
2021-11-30 14:13:57 +03:00
ismailgulek
c657a8bc68
Highlight initial event in the thread view
2021-11-30 00:31:28 +03:00
ismailgulek
c324c61ccf
Add threadId to room identification
2021-11-29 18:12:20 +03:00
ismailgulek
ce89a7e392
Display thread when row tapped
2021-11-19 17:51:40 +03:00
ismailgulek
2398a16b90
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-19 02:17:21 +03:00
ismailgulek
12de0012eb
Fix build
2021-11-19 02:17:01 +03:00
ismailgulek
c2d613801c
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-19 00:24:02 +03:00
ismailgulek
98802857b8
Merge branch 'develop' into ismail/5068_start_thread
2021-11-19 00:23:24 +03:00
Doug
f1b341d8e7
Merge branch 'master' into develop
...
# Conflicts:
# Podfile.lock
# Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
ismailgulek
4d982da0b3
Add eventId parameter to delegates
2021-11-12 17:24:58 +03:00
ismailgulek
e041b9003e
Merge branch 'develop' into ismail/5068_start_thread
2021-11-11 21:43:16 +03:00
Stefan Ceriu
3f1700d516
vector-im/element-ios/issues/5114 - Poll creation screen
...
- added input toolbar poll creation action.
- reordered input toolbar actions as per designs.
- added multiline text field and extracted common components.
2021-11-11 11:24:28 +02:00
ismailgulek
9d5ccc635e
Introduce RoomDisplayConfiguration for room display options
2021-11-10 18:03:02 +03:00
ismailgulek
7a5f4c9fc6
Initialize thread data source
2021-11-04 02:07:50 +03:00