Commit Graph

3921 Commits

Author SHA1 Message Date
MaximeE ea83927c74 5720: Update from develop 2022-03-22 09:41:25 +01:00
Anderas 7e39b92907 Merge pull request #5882 from vector-im/andy/5873_initial_sync
Do not clear cache if there are no stored filters
2022-03-22 08:19:47 +00:00
Doug 8978f245f7 Merge pull request #5861 from vector-im/doug/5652_ftue_personalisation
FTUE personalisation screens
2022-03-21 18:54:11 +00:00
Doug fea3147f8c Fix crash trying to remove a UserSession for a nil MXSession. 2022-03-21 17:50:05 +00:00
Doug 052c8ba24a Address PR comments
Add more docs.
Rename PhotoPickerPresenter to MediaPickerPresenter.
Use a Character for the placeholder avatar rather than a string.
2022-03-21 17:37:16 +00:00
Doug 49497d1bf3 Updates following self review. 2022-03-21 17:37:16 +00:00
Doug a8626557c1 Use UserIndicatorPresenter for onboarding personalisation.
Remove the service from the display name screen to match the avatar screen.
Add a loading indicator to PhotoPickerPresenter.
Fix layout issue when selecting non-square avatar image.
2022-03-21 17:37:16 +00:00
Doug 059a8181ed Add onboarding avatar screen.
Includes a PhotoPickerPresenter to pick photos without requesting permissions.
2022-03-21 17:36:40 +00:00
Doug 11b55aea4b Add FTUE display name screen.
Use UserSession instead of userId & MXSession in OnboardingCoordinator
2022-03-21 17:36:40 +00:00
Stefan Ceriu bd45e2b93b Fix user suggestions not showing up when re-entering a room. 2022-03-21 18:40:21 +02:00
Andy Uhnak 630feb757f Do not clear cache if there are no stored filters 2022-03-21 16:08:17 +00:00
Doug f91a56295f Re-enable NSException on Share extension dismiss.
Disable crash logging in the share extension because of this.
2022-03-21 10:06:19 +00:00
Gil Eluard c2dccbc562 Merge pull request #5856 from vector-im/gil/5500-Change_behaviour_of_avatar_self_in_left_menu
Change behaviour of avatar/self in left menu to match common paradigm…
2022-03-21 10:21:54 +01:00
Andy Uhnak 63c16f4441 Merge branch 'master' into develop 2022-03-18 17:01:32 +00:00
Andy Uhnak 143c19e185 Fix broken indicators on iPad 2022-03-18 15:26:30 +00:00
SBiOSoftWhare 4fa2d41d72 Fix conflicts with develop 2022-03-18 15:12:34 +01:00
Andy Uhnak 8877259c18 Revert copy change 2022-03-18 14:02:50 +00:00
Andy Uhnak 7a8114bec3 Allow ignoring invited users that have not joined a room yet 2022-03-18 13:31:43 +00:00
ismailgulek 9481f391ce Update thread list bar button item badge 2022-03-18 02:08:03 +03:00
SBiOSoftWhare e699d91c5b RoomVC: Handle theme change for live location banner. 2022-03-17 17:34:09 +01:00
Anderas 3f79f7a8b4 Merge pull request #5852 from vector-im/andy/5547_crash_tabs
Fix crash when pressing tabs
2022-03-17 16:04:30 +00:00
SBiOSoftWhare 63654b7137 RoomCoordinator: Update with new RoomViewControllerDelegate methods. 2022-03-17 16:59:30 +01:00
SBiOSoftWhare 35cbfc757a RoomVC: Handle live location banner. 2022-03-17 16:58:52 +01:00
MaximeE 8ca6359c4c 5720: Update UI in location sharing View 2022-03-17 16:52:22 +01:00
SBiOSoftWhare 8f8461a978 Create LiveLocationSharingBannerView. 2022-03-17 16:48:10 +01:00
Gil Eluard 31acfe35d4 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 123bbbf3dc Change behaviour of avatar/self in left menu to match common paradigm and take user to their own profile/settings
- Done
2022-03-17 15:56:33 +01:00
Gil Eluard 7300f06d35 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 3d9a3a2e5b Fix crash when pressing tabs 2022-03-17 12:37:42 +00:00
ismailgulek 9511a40d84 fix missing MXJSONModel setters 2022-03-17 15:31:15 +03:00
ismailgulek bd24d0bd29 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 ee65744103 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 0625ac373d 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 bbe2d87c71 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 b210582b01 Use event's new content when available 2022-03-17 14:24:02 +03:00
Gil Eluard f6d8bd1320 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 3dac5660ca 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 2436da6547 Instrument metrics for iOS for the IA project #5401
- updates after review
2022-03-17 10:48:00 +01:00
Gil Eluard 96c86d97d5 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 aad08cf6a2 Instrument metrics for iOS for the IA project #5401
- Added last needed metrics
2022-03-16 16:56:27 +01:00
Gil Eluard fd2aee323b Add trigger to join and view room metrics events #5769
- Code tweaks
2022-03-16 16:25:12 +01:00
ismailgulek 0158373fdd 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 978584041f Add trigger to join and view room metrics events #5769
- Code tweaks
2022-03-16 16:10:28 +01:00
ismailgulek 97967e8f33 Pass threadId of room data source on replies 2022-03-16 17:13:18 +03:00
Gil Eluard 5cc106e64d Crash after leaving empty space and all rooms #5825
- fixed
2022-03-16 14:52:06 +01:00
ismailgulek d454726723 Avoid thread view controller pushing twice 2022-03-16 13:34:55 +03:00
Doug cc6afc5f75 Make scrollEdgesAppearance singular to match UIKit 2022-03-16 08:58:21 +00:00
ismailgulek 699e99b021 Reload thread screen for the first message 2022-03-15 16:15:38 +03:00
ismailgulek dcc7a48664 Fix tests 2022-03-15 13:55:44 +03:00
ismailgulek 7e929c09e9 Merge branch 'develop' into ismail/5816_reply_fallback 2022-03-15 13:50:06 +03:00