Gil Eluard
|
2ba9d4a593
|
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 |
|
Andy Uhnak
|
909de0e44f
|
Fix crash when pressing tabs
|
2022-03-17 12:37:42 +00:00 |
|
ismailgulek
|
ae496eeed3
|
fix missing MXJSONModel setters
|
2022-03-17 15:31:15 +03:00 |
|
ismailgulek
|
9b464b07d7
|
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
|
e0acc987b9
|
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
|
7d8c8293f1
|
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
|
5331d941ad
|
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
|
3abe3a5527
|
Add changelog
|
2022-03-17 14:24:50 +03:00 |
|
ismailgulek
|
a424a0d7f9
|
Use event's new content when available
|
2022-03-17 14:24:02 +03:00 |
|
Gil Eluard
|
164be250ae
|
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
|
0a5164a435
|
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
|
21d252aba0
|
Instrument metrics for iOS for the IA project #5401
- updates after review
|
2022-03-17 10:48:00 +01:00 |
|
Gil Eluard
|
25026afde5
|
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
|
9ff5cf3163
|
Instrument metrics for iOS for the IA project #5401
- Added last needed metrics
|
2022-03-16 16:56:27 +01:00 |
|
Gil Eluard
|
2bb66b526d
|
Add trigger to join and view room metrics events #5769
- Code tweaks
|
2022-03-16 16:25:12 +01:00 |
|
ismailgulek
|
3171b2533d
|
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
|
b8f3598d8b
|
Add trigger to join and view room metrics events #5769
- Code tweaks
|
2022-03-16 16:10:28 +01:00 |
|
Doug
|
14fddc1d22
|
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
|
0f8d5045d2
|
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
|
6b2317b50d
|
Add changelog
|
2022-03-16 17:13:52 +03:00 |
|
ismailgulek
|
0184791f23
|
Pass threadId of room data source on replies
|
2022-03-16 17:13:18 +03:00 |
|
Gil Eluard
|
63dbf10972
|
Crash after leaving empty space and all rooms #5825
- fixed
|
2022-03-16 14:52:06 +01:00 |
|
SBiOSoftWhare
|
2dcd713199
|
LocationSharingViewModelTests: Fix issues.
|
2022-03-16 14:39:51 +01:00 |
|
SBiOSoftWhare
|
00f19be101
|
Update changes
|
2022-03-16 11:39:15 +01:00 |
|
SBiOSoftWhare
|
d9ac23b4a3
|
LocationSharingView: Update with updated map view and model.
|
2022-03-16 11:35:15 +01:00 |
|
ismailgulek
|
c3acbf5d41
|
Avoid thread view controller pushing twice
|
2022-03-16 13:34:55 +03:00 |
|
SBiOSoftWhare
|
9dda19bc8a
|
LocationSharingView: Update state and view model.
|
2022-03-16 11:33:36 +01:00 |
|
SBiOSoftWhare
|
42d4e4afd4
|
Create reusable MapCreditsView.
|
2022-03-16 11:04:58 +01:00 |
|
SBiOSoftWhare
|
27fc574b9c
|
UserLocationAnnotatonView: Handle init with UserLocationAnnotation.
|
2022-03-16 10:57:00 +01:00 |
|
SBiOSoftWhare
|
8a42d65559
|
Create custom map annotation UserLocationAnnotation.
|
2022-03-16 10:50:18 +01:00 |
|
SBiOSoftWhare
|
ae191f1549
|
LocationSharingMapView: Support displaying multiple annotation views.
|
2022-03-16 10:49:24 +01:00 |
|
Doug
|
b42c3fa87c
|
Make scrollEdgesAppearance singular to match UIKit
|
2022-03-16 08:58:21 +00:00 |
|
ismailgulek
|
32591bfe2e
|
Add changelog
|
2022-03-15 16:16:19 +03:00 |
|
ismailgulek
|
f4da3e517d
|
Reload thread screen for the first message
|
2022-03-15 16:15:38 +03:00 |
|
ismailgulek
|
0d5bd2341a
|
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
|
07d734b8c2
|
Fix tests
|
2022-03-15 13:55:44 +03:00 |
|
ismailgulek
|
4e8bb7b4b0
|
Merge branch 'develop' into ismail/5816_reply_fallback
|
2022-03-15 13:50:06 +03:00 |
|
Gil Eluard
|
75203ef2f1
|
Add trigger to join and view room metrics events #5769
- Added changelog
|
2022-03-15 10:50:35 +01:00 |
|
Gil Eluard
|
2e93b9a66e
|
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
|
18e5d22b92
|
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
|
a0f45a2d78
|
Prepare for new sprint
|
2022-03-14 16:26:10 +00:00 |
|
Andy Uhnak
|
9a4c3e485b
|
Merge branch 'master' into develop
|
2022-03-14 16:26:07 +00:00 |
|
Andy Uhnak
|
31ff803f59
|
Merge branch 'release/1.8.6/master'
|
2022-03-14 16:26:01 +00:00 |
|
Andy Uhnak
|
a719fc5fdf
|
finish version++
|
2022-03-14 16:26:01 +00:00 |
|
Anderas
|
2e04271a38
|
Merge pull request #5820 from vector-im/release/1.8.6/release
Release 1.8.6
|
2022-03-14 16:25:40 +00:00 |
|
Andy Uhnak
|
74f6b4f57c
|
version++
|
2022-03-14 15:45:55 +00:00 |
|
Andy Uhnak
|
5b94236cc5
|
changelog.d: Upgrade MatrixSDK version ([v0.22.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.6)).
|
2022-03-14 15:45:54 +00:00 |
|
Anderas
|
76eb83be75
|
Merge pull request #5809 from vector-im/andy/5807_ignore_from_invite
Ignore the sender of a room invite without needing to join the room first
|
2022-03-14 13:13:37 +00:00 |
|
ismailgulek
|
efae900a4e
|
Add changelog
|
2022-03-14 13:44:50 +03:00 |
|
ismailgulek
|
0c0d6da1ff
|
Extend reply fallback for also non-thread events
|
2022-03-14 13:44:13 +03:00 |
|