ff685a4c37
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
a5ae727f84
Update activity indicators on leaving room
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-18 13:31:21 +00:00
78b412c41a
RoomDataSource: Use RoomTimelineCellDecorator to animate read marker dismiss.
2022-02-17 17:46:26 +01:00
92f633cccb
Merge branch 'master' into develop
2022-02-16 12:45:06 +02:00
13a59eb845
Fix for images sometimes being sent unencrypted in an encrypted room.
2022-02-16 12:42:00 +02:00
f2e8faf54e
Use thread protocols where possible
2022-02-11 18:11:44 +03:00
7964d314c8
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
1ab7643de1
Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195.
2022-02-10 08:43:18 +02:00
b16a744a25
RoomVC: Handle emote cell identifiers.
2022-02-08 11:57:45 +01:00
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
aacda37b56
Merge branch 'develop' into steve/5210_bubble_polls
2022-02-04 16:32:33 +01:00
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
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
2a95516545
Fix review remarks
2022-02-03 14:25:14 +03:00
4cf78a2bf1
Merge branch 'develop' into ismail/5096_thread_notifications
2022-02-03 14:01:21 +03:00
a85052bf67
RoomVC: Handle poll cell identifiers.
2022-02-03 09:56:59 +01:00
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
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
95db348bdc
Merge branch 'develop' into ismail/5096_thread_notifications
2022-02-02 12:46:00 +03:00
a3c6fc56c6
De-labs location sharing and enable it by default.
2022-02-02 09:59:45 +02:00
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
a3f3d874f3
RoomViewController: Handle file without thumbnail cell identifiers.
2022-01-31 10:48:35 +01:00
d2e5e29ad9
Merge branch 'develop' into ismail/5096_thread_notifications
2022-01-27 03:20:25 +03:00
b3362c05d4
Make remove poll action destructive as well
2022-01-26 16:03:17 +03:00
d79af0e26d
Fix Doug's remarks
2022-01-26 15:58:37 +03:00
d71b9ed645
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-26 14:27:25 +03:00
a24e208cb1
Fix review remarks
2022-01-25 23:59:19 +03:00
c09fcded0a
RoomVC: Handle new voice location cell identifiers.
2022-01-25 16:43:21 +01:00
a755321fee
RoomVC: Handle new voice message cell identifiers.
2022-01-25 14:53:53 +01:00
6ac01ae245
Merge branch 'develop' into ismail/5068_start_thread
2022-01-25 14:30:52 +03:00
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
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
5c653b5346
Implement going back to live room data sources for threads, fix bugs around it
2022-01-21 01:56:51 +03:00
d22a8d5862
Scroll to highlighted event better
2022-01-21 00:59:01 +03:00
8f3c47a321
Refactor RoomTimelineCellProviderProtocol to RoomTimelineCellProvider.
2022-01-20 17:09:34 +01:00
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
6c9f11f6c5
Specify source of alertView popup for selecting video/image size on upload
2022-01-18 21:35:53 +00:00
8cee4153e5
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications
2022-01-19 00:12:40 +03:00
83948f113f
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-19 00:09:26 +03:00
701d38c798
Merge branch 'develop' into ismail/5068_start_thread
2022-01-19 00:07:52 +03:00
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
0980804213
vector-im/element-ios/issues/5114 - Allow editing poll start events.
2022-01-18 20:05:10 +02:00
f3247d6396
Disable sending polls in threads
2022-01-18 16:32:23 +03:00
7af7bd12e7
Dismiss keyboard when additional menu shown
2022-01-18 02:27:44 +03:00
fb643ed8c0
Various design fixes
2022-01-17 16:32:32 +03:00
812b58592e
Fix build after merges
2022-01-17 13:35:14 +03:00
23eeedb9ac
Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications
2022-01-17 11:39:25 +03:00
630f121546
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-17 11:37:41 +03:00
a314deb7a1
Merge branch 'develop' into ismail/5068_start_thread
2022-01-17 11:35:10 +03:00
de0163cf65
RoomVC: Handle cell provider.
2022-01-14 10:23:15 +01:00
Gil Eluard
Andy Uhnak
SBiOSoftWhare
Stefan Ceriu
Doug
ismailgulek
aringenbach
Stefan Ceriu
SBiOSoftWhare
David Langley