0abef4312e
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
bca69bb7c8
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
3a9d847954
3779: Add comments
2022-02-25 17:03:09 +01:00
8580195006
3779: Apply PR comments
2022-02-25 16:22:15 +01:00
ec9e45ed43
Merge branch 'develop' into maximee/3779_fix_reply_after_jump_unread
2022-02-25 15:17:01 +01:00
4f4471a65a
3779: Apply PR comments
2022-02-25 12:18:28 +01:00
a5f3987bd1
Merge pull request #5630 from vector-im/andy/5605_leave_room
...
Update activity indicators on leaving room
2022-02-25 09:52:03 +00:00
d3056d0ad0
3779: show the input tool bar on timeline not live
2022-02-23 11:03:22 +01:00
079d50e733
Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
...
# Conflicts:
# Podfile.lock
2022-02-21 17:57:58 +01:00
ceb74c2f6e
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/People/PeopleViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
9eae7c02bb
Update activity indicators on leaving room
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-18 13:31:21 +00:00
3351af3e9d
RoomDataSource: Use RoomTimelineCellDecorator to animate read marker dismiss.
2022-02-17 17:46:26 +01:00
02ab8eec9e
Merge branch 'master' into develop
2022-02-16 12:45:06 +02:00
37a0c72169
Fix for images sometimes being sent unencrypted in an encrypted room.
2022-02-16 12:42:00 +02:00
c740a8110e
Use thread protocols where possible
2022-02-11 18:11:44 +03:00
2f6546799e
Add objective C support to SwiftGen assets helpers ( #5533 )
...
* Add objective C support to SwiftGen assets helpers
* Use dot notation in ObjC & fix minor issues
Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr >
2022-02-10 17:13:23 +01:00
4b1eb75fd3
Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195.
2022-02-10 08:43:18 +02:00
8947fd6549
RoomVC: Handle emote cell identifiers.
2022-02-08 11:57:45 +01:00
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
e090fef42e
Merge branch 'develop' into steve/5210_bubble_polls
2022-02-04 16:32:33 +01:00
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
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
d861506d9f
Fix review remarks
2022-02-03 14:25:14 +03:00
1face7d301
Merge branch 'develop' into ismail/5096_thread_notifications
2022-02-03 14:01:21 +03:00
e31dfe0e40
RoomVC: Handle poll cell identifiers.
2022-02-03 09:56:59 +01:00
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
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
e84e78b1e7
Merge branch 'develop' into ismail/5096_thread_notifications
2022-02-02 12:46:00 +03:00
500aba906e
De-labs location sharing and enable it by default.
2022-02-02 09:59:45 +02:00
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
5e11c6c6c8
RoomViewController: Handle file without thumbnail cell identifiers.
2022-01-31 10:48:35 +01:00
a13d5704dc
Merge branch 'develop' into ismail/5096_thread_notifications
2022-01-27 03:20:25 +03:00
cf8ff7dc2e
Make remove poll action destructive as well
2022-01-26 16:03:17 +03:00
ae57c7e1fb
Fix Doug's remarks
2022-01-26 15:58:37 +03:00
9c5b83a1b3
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-26 14:27:25 +03:00
f7694e27cb
Fix review remarks
2022-01-25 23:59:19 +03:00
7e6616985a
RoomVC: Handle new voice location cell identifiers.
2022-01-25 16:43:21 +01:00
b0354ee7a5
RoomVC: Handle new voice message cell identifiers.
2022-01-25 14:53:53 +01:00
4dc28af682
Merge branch 'develop' into ismail/5068_start_thread
2022-01-25 14:30:52 +03:00
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
04267efeee
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
f5512d1be4
Implement going back to live room data sources for threads, fix bugs around it
2022-01-21 01:56:51 +03:00
ef05746fe8
Scroll to highlighted event better
2022-01-21 00:59:01 +03:00
11639b87f6
Refactor RoomTimelineCellProviderProtocol to RoomTimelineCellProvider.
2022-01-20 17:09:34 +01:00
de2e4bf152
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
fea1c9f1bd
Specify source of alertView popup for selecting video/image size on upload
2022-01-18 21:35:53 +00:00
81405b4dd6
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications
2022-01-19 00:12:40 +03:00
f3334ad5ae
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-19 00:09:26 +03:00
3e2c4b32b0
Merge branch 'develop' into ismail/5068_start_thread
2022-01-19 00:07:52 +03:00
9ddf80f54b
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
Gil Eluard
MaximeE
Anderas
SBiOSoftWhare
Stefan Ceriu
Doug
ismailgulek
aringenbach
Stefan Ceriu
SBiOSoftWhare
David Langley