69cec41da0
Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event
2022-03-15 10:32:19 +01:00
c747ff86ac
Add trigger to join and view room metrics events #5769
...
- Added trigger for JoinedRoom event
- Tracking ViewRoom event for rooms and events
2022-03-15 10:31:24 +01:00
abce639820
Merge branch 'master' into develop
2022-03-14 16:26:07 +00:00
3865143ef5
Anchor action sheet to source view
2022-03-14 08:47:52 +00:00
f6ee46890e
Ignore the sender of a room invite without needing to join the room first
2022-03-11 16:24:40 +00:00
a80e89f13c
Room: Refresh header when call actions become available
2022-03-11 09:09:49 +01:00
838431368a
Add more comments
2022-03-10 17:40:23 +00:00
863d7ca2bd
Do not show user indicators when the view controller is not visible
2022-03-10 15:56:40 +00:00
cdd66146d8
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/Room/Settings/RoomSettingsViewController.h
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
acf7d0de13
Instrument missing screen metrics ( #5764 )
...
* Instrument missing screen metrics
- Done
2022-03-08 10:13:46 +01:00
cf015c4ef2
selection impossible when filtering in add room screen #5757 ( #5758 )
...
- Fixed
- Other minor code / UI tweaks
2022-03-07 12:25:50 +01:00
59038e18c1
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
86c2b4ebb5
Remove MatrixKitL10n from SwiftGen
...
Uses VectorL10n everywhere.
2022-03-03 09:34:54 +00:00
fda6ba2862
Merge pull request #5690 from vector-im/andy/5603_room_indicators
...
Room activity indicators
2022-03-01 13:08:29 +00:00
0f043fd357
Merge pull request #5709 from vector-im/ismail/5365_thread_analytics
...
Threads: Analytics
2022-03-01 15:23:47 +03:00
72e280652a
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
220e1872d4
Timeline: Rename call cells.
2022-02-28 16:48:41 +01:00
c84285955b
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
3f1f75f7ce
Implement analytics for threads
2022-02-28 17:46:57 +03:00
ee13527618
3779: Add comments
2022-02-25 17:03:09 +01:00
4a003d49b1
3779: Apply PR comments
2022-02-25 16:22:15 +01:00
b0516ea7cd
Merge branch 'develop' into maximee/3779_fix_reply_after_jump_unread
2022-02-25 15:17:01 +01:00
4cb4eda6f1
3779: Apply PR comments
2022-02-25 12:18:28 +01:00
4617b3ed69
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
c980315d83
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
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
Gil Eluard
Andy Uhnak
Arnaud Ringenbach
Doug
ismailgulek
SBiOSoftWhare
ismailgulek
MaximeE
Stefan Ceriu
aringenbach
Stefan Ceriu
SBiOSoftWhare