559bb88ae4
Room user indicators
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-25 10:47:53 +00:00
c9ef4ac58b
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
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
c980315d83
3779: show the input tool bar on timeline not live
2022-02-23 11:03:22 +01:00
d3056d0ad0
3779: show the input tool bar on timeline not live
2022-02-23 11:03:22 +01:00
f9b008e684
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
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
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
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
a5ae727f84
Update activity indicators on leaving room
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-18 13:31:21 +00:00
9eae7c02bb
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
3351af3e9d
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
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
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
c740a8110e
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
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
1ab7643de1
Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195.
2022-02-10 08:43:18 +02:00
4b1eb75fd3
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
8947fd6549
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
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
aacda37b56
Merge branch 'develop' into steve/5210_bubble_polls
2022-02-04 16:32:33 +01:00
e090fef42e
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
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
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
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
2a95516545
Fix review remarks
2022-02-03 14:25:14 +03:00
d861506d9f
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
1face7d301
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
e31dfe0e40
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
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
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
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
95db348bdc
Merge branch 'develop' into ismail/5096_thread_notifications
2022-02-02 12:46:00 +03:00
e84e78b1e7
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
500aba906e
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
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
a3f3d874f3
RoomViewController: Handle file without thumbnail cell identifiers.
2022-01-31 10:48:35 +01:00
Andy Uhnak
MaximeE
Gil Eluard
SBiOSoftWhare
Stefan Ceriu
Doug
ismailgulek
aringenbach
Stefan Ceriu
SBiOSoftWhare