Commit Graph

14795 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
SBiOSoftWhare f4878b002a UIButton: Add convenient method to modify font. 2022-03-17 16:39:05 +01:00
SBiOSoftWhare f9ec4fddd5 Add live location banner strings. 2022-03-17 16:37:32 +01:00
SBiOSoftWhare dc617bbf7c Add live location icon. 2022-03-17 16:37:07 +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
ismailgulek 601f2c6318 Merge pull request #5850 from vector-im/ismail/5841_edit_asterisk
Fix edit fallback usage in threads
2022-03-17 17:12:42 +03:00
Gil Eluard fb4cc9c82f Add trigger to join and view room metrics events #5769
- update `Podfile.lock` after updating `release/swift` branch for analytics
2022-03-17 15:00:19 +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 e383952c19 Add changelog 2022-03-17 14:24:50 +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
Doug fce5b496fe Merge pull request #5826 from vector-im/doug/scroll_edge_name
Make scrollEdgesAppearance singular to match UIKit
2022-03-16 14:45:49 +00:00
SBiOSoftWhare 3845c8d99a Merge pull request #5828 from vector-im/steve/5827_map_multiple_annot
Location sharing: Support multiple user annotation views on the map
2022-03-16 15:22:04 +01:00
ismailgulek 8f2ab64e95 Add changelog 2022-03-16 17:13:52 +03: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
SBiOSoftWhare e209e63707 LocationSharingViewModelTests: Fix issues. 2022-03-16 14:39:51 +01:00
SBiOSoftWhare 675595a2b4 Update changes 2022-03-16 11:39:15 +01:00
SBiOSoftWhare bea22cea81 LocationSharingView: Update with updated map view and model. 2022-03-16 11:35:15 +01:00
ismailgulek 4763aac275 Avoid thread view controller pushing twice 2022-03-16 13:34:55 +03:00
SBiOSoftWhare a18c303156 LocationSharingView: Update state and view model. 2022-03-16 11:33:36 +01:00
SBiOSoftWhare 76662606c5 Create reusable MapCreditsView. 2022-03-16 11:04:58 +01:00
SBiOSoftWhare 7bc5f85235 UserLocationAnnotatonView: Handle init with UserLocationAnnotation. 2022-03-16 10:57:00 +01:00
SBiOSoftWhare 376675ee42 Create custom map annotation UserLocationAnnotation. 2022-03-16 10:50:18 +01:00
SBiOSoftWhare 90fbf3631b LocationSharingMapView: Support displaying multiple annotation views. 2022-03-16 10:49:24 +01:00
Doug 66a257fe0b Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
ismailgulek 8f1059ecb4 Add changelog 2022-03-15 16:16:19 +03:00
ismailgulek 27e3e0ab2c Reload thread screen for the first message 2022-03-15 16:15:38 +03:00
ismailgulek 2f056f42b0 Merge pull request #5817 from vector-im/ismail/5816_reply_fallback
Extend Reply Fallbacks to non-thread Events
2022-03-15 14:46:25 +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 bfbbaab006 Add trigger to join and view room metrics events #5769
- Added changelog
2022-03-15 10:50:35 +01: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 7140e83c26 Prepare for new sprint 2022-03-14 16:26:10 +00:00
Andy Uhnak 2a7036819c Merge branch 'master' into develop 2022-03-14 16:26:07 +00:00
Andy Uhnak 840f2e7319 Merge branch 'release/1.8.6/master' 2022-03-14 16:26:01 +00:00