Commit Graph

3896 Commits

Author SHA1 Message Date
SBiOSoftWhare e8a4e5fa5f RoomVC: Handle live location banner. 2022-03-17 16:58:52 +01:00
SBiOSoftWhare 1f136aaec8 Create LiveLocationSharingBannerView. 2022-03-17 16:48:10 +01:00
Gil Eluard 7a38ac6926 Merge pull request #5834 from vector-im/gil/5769_add_trigger_to_join_and_view_room_metrics_event
Add trigger to JoinedRoom event and implement ViewRoom metrics event
2022-03-17 16:09:38 +01:00
Gil Eluard 1203c7725a Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event
# Conflicts:
#	Riot/Modules/Analytics/Analytics.swift
2022-03-17 13:59:24 +01:00
ismailgulek 6be1f0c37b fix missing MXJSONModel setters 2022-03-17 15:31:15 +03:00
ismailgulek 8d208e5b54 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:29 +03:00
ismailgulek 57b5f996a1 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:22 +03:00
ismailgulek c59d052f22 Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:14 +03:00
ismailgulek 9fa6e84a4c Update Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
Co-authored-by: Gil Eluard <gile@element.io>
2022-03-17 15:27:05 +03:00
ismailgulek eaca186e5b Use event's new content when available 2022-03-17 14:24:02 +03:00
Gil Eluard 5eb9445f83 Merge pull request #5836 from vector-im/gil/5401_Instrument_metrics_for_the_IA_project
Instrument metrics for iOS for the IA project #5401
2022-03-17 11:55:55 +01:00
ismailgulek efdb33df23 Merge pull request #5822 from vector-im/ismail/5441_thread_timeline_fixes
Thread Timeline Fixes
2022-03-17 13:16:49 +03:00
Gil Eluard 75c1b4342a Instrument metrics for iOS for the IA project #5401
- updates after review
2022-03-17 10:48:00 +01:00
Gil Eluard b0fdede3b6 Merge pull request #5831 from vector-im/gil/5825_crash_after_leaving_empty_space_and_all_rooms
Crash after leaving empty space and all rooms
2022-03-17 10:03:40 +01:00
Gil Eluard c5820ba22e Instrument metrics for iOS for the IA project #5401
- Added last needed metrics
2022-03-16 16:56:27 +01:00
Gil Eluard d6cd5fbb80 Add trigger to join and view room metrics events #5769
- Code tweaks
2022-03-16 16:25:12 +01:00
ismailgulek d8221e44d3 Merge pull request #5833 from vector-im/ismail/5829_reply_to_thread_root
Fix replies to thread root events
2022-03-16 18:14:07 +03:00
Gil Eluard 5116efc7cc Add trigger to join and view room metrics events #5769
- Code tweaks
2022-03-16 16:10:28 +01:00
ismailgulek 2666401a52 Pass threadId of room data source on replies 2022-03-16 17:13:18 +03:00
Gil Eluard ab8458ebb2 Crash after leaving empty space and all rooms #5825
- fixed
2022-03-16 14:52:06 +01:00
ismailgulek 4763aac275 Avoid thread view controller pushing twice 2022-03-16 13:34:55 +03:00
Doug 66a257fe0b Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
ismailgulek 27e3e0ab2c Reload thread screen for the first message 2022-03-15 16:15:38 +03:00
ismailgulek c5a80b8de9 Fix tests 2022-03-15 13:55:44 +03:00
ismailgulek 1986e04fa2 Merge branch 'develop' into ismail/5816_reply_fallback 2022-03-15 13:50:06 +03:00
Gil Eluard bd0041c5dc Merge branch 'develop' into gil/5769_add_trigger_to_join_and_view_room_metrics_event 2022-03-15 10:32:19 +01:00
Gil Eluard 67b0df922f 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
Andy Uhnak 2a7036819c Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
ismailgulek e925bb0380 Extend reply fallback for also non-thread events 2022-03-14 13:44:13 +03:00
Andy Uhnak 9751d22772 Anchor action sheet to source view 2022-03-14 08:47:52 +00:00
Andy Uhnak e0adc29903 Ignore the sender of a room invite without needing to join the room first 2022-03-11 16:24:40 +00:00
Anderas c5fc649e82 Merge pull request #5804 from vector-im/andy/5801_dismiss_indicators
Do not show user indicators when the view controller is not visible
2022-03-11 08:16:03 +00:00
Arnaud Ringenbach 63cb0e0ce7 Room: Refresh header when call actions become available 2022-03-11 09:09:49 +01:00
Andy Uhnak 18d0ccf6b7 Add more comments 2022-03-10 17:40:23 +00:00
Andy Uhnak 0fed5c6a73 Name changes 2022-03-10 17:32:25 +00:00
Andy Uhnak 902a227e8d Do not show user indicators when the view controller is not visible 2022-03-10 15:56:40 +00:00
Doug 4fe023daee Fix social button visibility during registration
Hide the back button at the same time.
Disable custom server entry when picking a different use case.
2022-03-10 11:28:03 +00:00
Gil Eluard cab04809c5 Merge pull request #5748 from vector-im/gil/SP1_space_creation
Creating & managing Spaces
2022-03-10 10:18:48 +01:00
Anderas 7c13648976 Merge pull request #5781 from vector-im/andy/5780_indicator_context
Replace user indicator presenting view controller with context
2022-03-09 12:28:50 +00:00
Andy Uhnak 3ad2348639 Break retain cycle between split controller and indicator presenters 2022-03-09 09:50:56 +00:00
Andy Uhnak 72179db80f Replace user indicator presenting view controller with context 2022-03-09 09:11:47 +00:00
ismailgulek 61fde700b5 Merge branch 'develop' into ismail/5749_thread_notifications 2022-03-08 21:18:59 +03:00
ismailgulek 49683e11d3 Open & reply to thread only if threads enabled 2022-03-08 17:09:29 +03:00
Gil Eluard 5229264d21 Merge branch 'develop' into gil/SP1_space_creation 2022-03-08 13:19:38 +01:00
Anderas 5dfbaef799 Merge pull request #5767 from vector-im/andy/5752_missing_spinner
Use split controller's top navigation controller to present toasts
2022-03-08 11:30:52 +00:00
Andy Uhnak 03c6641d66 Update indicator after ipad layout change 2022-03-08 10:40:01 +00:00
Gil Eluard 4f43793313 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
ismailgulek 26b8afeace Navigate to thread from notification 2022-03-08 12:58:13 +03:00
Gil Eluard 24de57bb58 Instrument missing screen metrics (#5764)
* Instrument missing screen metrics

- Done
2022-03-08 10:13:46 +01:00
Andy Uhnak eef9802e96 Use split controller's top navigation controller to present toasts 2022-03-08 08:34:45 +00:00