ismailgulek
c1b6d5e54b
Merge pull request #5709 from vector-im/ismail/5365_thread_analytics
...
Threads: Analytics
2022-03-01 15:23:47 +03:00
Gil Eluard
cfb9021b92
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
SBiOSoftWhare
aab1bf29aa
Timeline: Rename call cells.
2022-02-28 16:48:41 +01:00
Gil Eluard
5387a96f1a
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
ismailgulek
65c4b71694
Implement analytics for threads
2022-02-28 17:46:57 +03:00
MaximeE
7a87256793
3779: Add comments
2022-02-25 17:03:09 +01:00
MaximeE
33539eb08f
3779: Apply PR comments
2022-02-25 16:22:15 +01:00
MaximeE
64fad31acc
Merge branch 'develop' into maximee/3779_fix_reply_after_jump_unread
2022-02-25 15:17:01 +01:00
MaximeE
d77c1a8db4
3779: Apply PR comments
2022-02-25 12:18:28 +01:00
Andy Uhnak
3f82e61723
Room user indicators
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-25 10:47:53 +00:00
Anderas
dbe027e219
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
MaximeE
8fe40120c9
3779: show the input tool bar on timeline not live
2022-02-23 11:03:22 +01:00
Gil Eluard
3ef9069e9f
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
Gil Eluard
af99903cea
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
Andy Uhnak
e4993d8ef1
Update activity indicators on leaving room
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-18 13:31:21 +00:00
SBiOSoftWhare
7ec8db5213
RoomDataSource: Use RoomTimelineCellDecorator to animate read marker dismiss.
2022-02-17 17:46:26 +01:00
Stefan Ceriu
1a0af46a18
Merge branch 'master' into develop
2022-02-16 12:45:06 +02:00
Doug
2749368ec6
Fix for images sometimes being sent unencrypted in an encrypted room.
2022-02-16 12:42:00 +02:00
ismailgulek
4291b9f7d9
Use thread protocols where possible
2022-02-11 18:11:44 +03:00
aringenbach
87ad400eb6
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
Stefan Ceriu
bc60512101
Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195.
2022-02-10 08:43:18 +02:00
SBiOSoftWhare
7cce2bb115
RoomVC: Handle emote cell identifiers.
2022-02-08 11:57:45 +01:00
Gil Eluard
0797dbbd1e
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
SBiOSoftWhare
90631393bb
Merge branch 'develop' into steve/5210_bubble_polls
2022-02-04 16:32:33 +01:00
Gil Eluard
4d6133ef85
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
e6f9d34036
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
352a6adef8
Fix review remarks
2022-02-03 14:25:14 +03:00
ismailgulek
32cb1eb0cb
Merge branch 'develop' into ismail/5096_thread_notifications
2022-02-03 14:01:21 +03:00
SBiOSoftWhare
accf465db9
RoomVC: Handle poll cell identifiers.
2022-02-03 09:56:59 +01:00
Anderas
bd8e389dca
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
Andy Uhnak
3b1afa652c
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
ismailgulek
c6db4e7e0f
Merge branch 'develop' into ismail/5096_thread_notifications
2022-02-02 12:46:00 +03:00
Stefan Ceriu
dd13a16be9
De-labs location sharing and enable it by default.
2022-02-02 09:59:45 +02:00
SBiOSoftWhare
6a2401b463
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
SBiOSoftWhare
01b4518081
RoomViewController: Handle file without thumbnail cell identifiers.
2022-01-31 10:48:35 +01:00
ismailgulek
38bb315866
Merge branch 'develop' into ismail/5096_thread_notifications
2022-01-27 03:20:25 +03:00
ismailgulek
49e2ead699
Make remove poll action destructive as well
2022-01-26 16:03:17 +03:00
ismailgulek
0984e9c794
Fix Doug's remarks
2022-01-26 15:58:37 +03:00
ismailgulek
98dd950a35
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-26 14:27:25 +03:00
ismailgulek
785fe6b4e0
Fix review remarks
2022-01-25 23:59:19 +03:00
SBiOSoftWhare
6afd5f7444
RoomVC: Handle new voice location cell identifiers.
2022-01-25 16:43:21 +01:00
SBiOSoftWhare
a884a0f421
RoomVC: Handle new voice message cell identifiers.
2022-01-25 14:53:53 +01:00
ismailgulek
d5a58779a3
Merge branch 'develop' into ismail/5068_start_thread
2022-01-25 14:30:52 +03:00
Gil Eluard
925ca81b04
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
SBiOSoftWhare
dc4d332222
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
ismailgulek
41f1b8dc72
Implement going back to live room data sources for threads, fix bugs around it
2022-01-21 01:56:51 +03:00
ismailgulek
88c5f910d5
Scroll to highlighted event better
2022-01-21 00:59:01 +03:00
SBiOSoftWhare
0c99258253
Refactor RoomTimelineCellProviderProtocol to RoomTimelineCellProvider.
2022-01-20 17:09:34 +01:00
David Langley
b7960fe06e
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
David Langley
1bf3e5179c
Specify source of alertView popup for selecting video/image size on upload
2022-01-18 21:35:53 +00:00