044367bda5
Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Strings.swift
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
# Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
# Riot/SupportingFiles/Riot-Bridging-Header.h
# RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2022-01-17 20:40:12 +01:00
8d6b2b7c20
Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications
2022-01-17 11:39:25 +03:00
7a74dc422f
Merge branch 'develop' into ismail/5068_start_thread
2022-01-17 11:35:10 +03:00
f9a4890459
Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Strings.swift
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
# Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
2022-01-13 16:30:55 +01:00
ce226cff8a
SP3.1: Update room settings for Spaces element-ios#5231
...
- Changed the Room Settings screen according to the new design
- Implemented the room access flow
- Added room upgrade support
- Implemented the room suggestion screen
2022-01-13 15:53:45 +01:00
61e9d4feda
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications
2022-01-12 13:58:48 +03:00
43a9371214
vector-im/element-ios/issues/5298 - Various tweaks following code review.
2022-01-04 17:33:32 +02:00
2e28cb0750
Merge branch 'develop' into ismail/5068_start_thread
2022-01-04 15:28:19 +03:00
18d064c752
Merge branch 'develop' into gil/5231_SP3-1_Update_room_settings_for_Spaces
...
# Conflicts:
# Riot/Generated/Strings.swift
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/SupportingFiles/Riot-Bridging-Header.h
# RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
2021-12-27 11:48:36 +01:00
acaee63a83
Retain AnalyticsService. Fix coordinator retain cycle.
2021-12-16 17:02:58 +00:00
8acde2fda4
Address most PR comments.
...
Update Podfile.lock
2021-12-16 17:01:23 +00:00
b3194a0fe9
Support link/html in analytics prompt strings.
...
Show the new prompt to everyone, even if they previously opted out.
Add docs to Analytics.
2021-12-16 17:01:22 +00:00
3bdf9b261a
Add AnalyticsPrompt to SwiftUI target and replace old UIAlertController.
2021-12-16 17:01:22 +00:00
f45b4644c3
Don't read analytics opt in status from account data.
...
Update PostHog to 1.4.3.
Add tests for prompt type.
2021-12-16 16:59:45 +00:00
8ec27e8579
Begin migration from Matomo to PostHog
...
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
01020cef53
Merge branch 'gil/5228_let_people_know_when_rooms_have_moved' into gil/5224_space_creation
2021-12-15 14:52:57 +01:00
96d465cde6
Let people know when rooms have moved element-ios
...
- Added coach message view
2021-12-15 14:51:26 +01:00
7699f05421
Merge branch 'ismail/5095_thread_search_results' into ismail/5096_thread_notifications
2021-12-10 11:14:55 +03:00
a97086aad8
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links
2021-12-10 11:08:01 +03:00
6480b354e8
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-12-10 11:03:00 +03:00
919911d53b
Invite to Space in room landing #5225
...
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
3349a77c20
Fix thread display configuration
2021-12-08 22:16:00 +03:00
860e7dbae2
Merge develop into steve/5020_matrixkit_merge
2021-11-30 16:16:52 +01:00
e6ef1be7b6
Update all Objective-C MatrixKit imports to handle new location.
2021-11-30 16:09:53 +01:00
30c2159fc1
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links
2021-11-30 01:54:56 +03:00
51c3e240e1
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-30 01:34:21 +03:00
fe336e0524
Add activity indicator when loading room and thread data sources
2021-11-30 00:59:59 +03:00
113383576b
Handle thread parameters
2021-11-29 18:27:00 +03:00
00ec31494f
Try to find the desired room in whole stack instead of only the last, and pop to it if found
2021-11-29 18:26:10 +03:00
5d618824b5
MasterTabBarController: Don't use MXCrypto private property.
2021-11-26 14:39:00 +01:00
9839e6ae10
Add threadId parameter to room navigation parameters
2021-11-25 16:28:42 +03:00
b35a9024ba
Add eventId parameter to delegates
2021-11-12 17:24:58 +03:00
ea322e1526
Merge branch 'develop' into phlpro/4722_objc_headers
2021-11-05 14:41:36 +01:00
a380a6b491
TabBarCoordinator: Improve tab bar controllers management. Avoid to have twice HomeVC in memory.
2021-10-29 14:48:42 +02:00
29fb0bd298
TabBarCoordinator: Fix space switching.
2021-10-28 18:50:35 +02:00
eddb43cfa3
Update Riot/Modules/TabBar/TabBarCoordinator.swift
...
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2021-10-28 18:48:19 +02:00
73f61df90c
TabBarCoordinator: Prevent to update master tab bar controllers when not needed.
2021-10-28 18:15:46 +02:00
af20d24960
Improve the Obj-C Generated Interface Header Name definition
2021-10-26 17:42:33 +02:00
70e5947cef
Refactor RoomPreviewScreenParameters to RoomPreviewNavigationParameters.
2021-10-21 14:47:17 +02:00
f692f65b7c
Refactor RoomPreviewScreenParameters to RoomPreviewNavigationParameters.
2021-10-21 11:57:13 +02:00
545c791b69
Refactor RoomScreenParameters to RoomNavigationParameters.
2021-10-21 11:40:18 +02:00
89f609b82b
Refactor RoomPreviewPresentationParameters to RoomPreviewScreenParameters.
2021-10-21 11:00:45 +02:00
5b97ad9e67
Refactor RoomPresentationParameters to RoomScreenParameters.
2021-10-21 10:55:13 +02:00
38514553c1
Rename UniversalLinkPresentationParameters to ScreenPresentationParameters.
2021-10-21 10:00:37 +02:00
9327b65465
TabBarCoordinator: Fix refacto issues.
2021-10-20 18:51:19 +02:00
9828a1fd8f
Update Riot/Modules/TabBar/TabBarCoordinator.swift
...
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2021-10-20 18:33:22 +02:00
204113f331
Update Riot/Modules/TabBar/TabBarCoordinator.swift
...
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2021-10-20 18:27:31 +02:00
8c57a3feca
UniversalLink: Improve group and contact presentation behaviour.
2021-10-20 15:55:46 +02:00
c49fe6cd7c
Merge develop into 4734_room_stack
2021-10-20 11:14:52 +02:00
2d2a2ded42
TabBarCoordinator: Reset split view detail on room leave.
2021-10-20 08:57:55 +02:00
Gil Eluard
ismailgulek
Stefan Ceriu
Doug
SBiOSoftWhare
Phl-Pro
SBiOSoftWhare
Philippe Loriaux