047342265b
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
23eeedb9ac
Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications
2022-01-17 11:39:25 +03:00
a314deb7a1
Merge branch 'develop' into ismail/5068_start_thread
2022-01-17 11:35:10 +03:00
f7ac4ee17d
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
086afb1835
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
7cb920e582
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications
2022-01-12 13:58:48 +03:00
7161b99d1c
vector-im/element-ios/issues/5298 - Various tweaks following code review.
2022-01-04 17:33:32 +02:00
ac1b79ff92
Merge branch 'develop' into ismail/5068_start_thread
2022-01-04 15:28:19 +03:00
b48d8443f9
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
5658bf97b5
Retain AnalyticsService. Fix coordinator retain cycle.
2021-12-16 17:02:58 +00:00
0ef348e2ca
Address most PR comments.
...
Update Podfile.lock
2021-12-16 17:01:23 +00:00
61f5764cca
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
ee74bc16fb
Add AnalyticsPrompt to SwiftUI target and replace old UIAlertController.
2021-12-16 17:01:22 +00:00
e8d02c5458
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
a984028479
Begin migration from Matomo to PostHog
...
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
39ba22ff57
Merge branch 'gil/5228_let_people_know_when_rooms_have_moved' into gil/5224_space_creation
2021-12-15 14:52:57 +01:00
41ee48c753
Let people know when rooms have moved element-ios
...
- Added coach message view
2021-12-15 14:51:26 +01:00
f72cd70885
Merge branch 'ismail/5095_thread_search_results' into ismail/5096_thread_notifications
2021-12-10 11:14:55 +03:00
1bc9db85c3
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links
2021-12-10 11:08:01 +03:00
048fa7d98e
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-12-10 11:03:00 +03:00
c1fa85be6f
Invite to Space in room landing #5225
...
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
24a7b6775b
Fix thread display configuration
2021-12-08 22:16:00 +03:00
d4e8d9400f
Merge develop into steve/5020_matrixkit_merge
2021-11-30 16:16:52 +01:00
e8d4af46d2
Update all Objective-C MatrixKit imports to handle new location.
2021-11-30 16:09:53 +01:00
abd5044023
Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links
2021-11-30 01:54:56 +03:00
38f47cec87
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-30 01:34:21 +03:00
f27a4a7ebd
Add activity indicator when loading room and thread data sources
2021-11-30 00:59:59 +03:00
bedae9704d
Handle thread parameters
2021-11-29 18:27:00 +03:00
7668c1b973
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
ac8fe910d6
MasterTabBarController: Don't use MXCrypto private property.
2021-11-26 14:39:00 +01:00
4e2bafbf84
Add threadId parameter to room navigation parameters
2021-11-25 16:28:42 +03:00
93f2fb024f
Add eventId parameter to delegates
2021-11-12 17:24:58 +03:00
31a99e2e09
Merge branch 'develop' into phlpro/4722_objc_headers
2021-11-05 14:41:36 +01:00
327e80de35
TabBarCoordinator: Improve tab bar controllers management. Avoid to have twice HomeVC in memory.
2021-10-29 14:48:42 +02:00
cf6a64639d
TabBarCoordinator: Fix space switching.
2021-10-28 18:50:35 +02:00
05d585d34b
Update Riot/Modules/TabBar/TabBarCoordinator.swift
...
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2021-10-28 18:48:19 +02:00
24835fd79e
TabBarCoordinator: Prevent to update master tab bar controllers when not needed.
2021-10-28 18:15:46 +02:00
216924165d
Improve the Obj-C Generated Interface Header Name definition
2021-10-26 17:42:33 +02:00
78f9940455
Refactor RoomPreviewScreenParameters to RoomPreviewNavigationParameters.
2021-10-21 14:47:17 +02:00
8f05cfcdda
Refactor RoomPreviewScreenParameters to RoomPreviewNavigationParameters.
2021-10-21 11:57:13 +02:00
eec3bfc5d0
Refactor RoomScreenParameters to RoomNavigationParameters.
2021-10-21 11:40:18 +02:00
724f46c155
Refactor RoomPreviewPresentationParameters to RoomPreviewScreenParameters.
2021-10-21 11:00:45 +02:00
3c6efbff31
Refactor RoomPresentationParameters to RoomScreenParameters.
2021-10-21 10:55:13 +02:00
9666e20c8f
Rename UniversalLinkPresentationParameters to ScreenPresentationParameters.
2021-10-21 10:00:37 +02:00
b40243480a
TabBarCoordinator: Fix refacto issues.
2021-10-20 18:51:19 +02:00
5804257a24
Update Riot/Modules/TabBar/TabBarCoordinator.swift
...
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2021-10-20 18:33:22 +02:00
757ab48cab
Update Riot/Modules/TabBar/TabBarCoordinator.swift
...
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2021-10-20 18:27:31 +02:00
33b27427a9
UniversalLink: Improve group and contact presentation behaviour.
2021-10-20 15:55:46 +02:00
2a22d75b2a
Merge develop into 4734_room_stack
2021-10-20 11:14:52 +02:00
41fcdb9231
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