5229264d21
Merge branch 'develop' into gil/SP1_space_creation
2022-03-08 13:19:38 +01:00
4f43793313
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/Room/Settings/RoomSettingsViewController.h
# Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
2022-03-08 11:23:55 +01:00
eef9802e96
Use split controller's top navigation controller to present toasts
2022-03-08 08:34:45 +00:00
9dbf34a308
Use new activity indicators on all tabs
2022-03-04 16:51:15 +00:00
42b4144323
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Config/BuildSettings.swift
# Riot/Generated/Strings.swift
# Riot/Modules/Home/HomeViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
2022-03-04 13:38:18 +01:00
830feeb7c0
Enable home and room user indicators
2022-03-01 15:50:24 +00:00
7c3a86c24d
Merge pull request #5690 from vector-im/andy/5603_room_indicators
...
Room activity indicators
2022-03-01 13:08:29 +00:00
0abef4312e
Merge branch 'develop' into gil/SP1_space_creation
2022-03-01 10:15:13 +01:00
709ea15631
Merge pull request #5698 from vector-im/doug/5653_ftue_analytics_prompt
...
Prepare onboarding flow for personalisation screens.
2022-02-28 17:25:19 +00:00
bca69bb7c8
SP3.1: Update room settings for Spaces #5231
...
- Update after review
2022-02-28 16:07:09 +01:00
4900c1018b
Prepare onboarding flow for personalisation screens.
...
Add a BuildSetting to control the display of the personalisation screens.
Add a property to delay the AuthenticationCoordinator from showing any screens.
Add Congratulations screen to onboarding flow.
2022-02-25 11:27:27 +00:00
559bb88ae4
Room user indicators
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-25 10:47:53 +00:00
c9c8438250
Rename properties and arguments
2022-02-22 16:44:22 +00:00
712d64204c
Rename Activity to UserIndicator
2022-02-22 16:14:03 +00:00
079d50e733
Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
...
# Conflicts:
# Podfile.lock
2022-02-21 17:57:58 +01:00
ceb74c2f6e
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/People/PeopleViewController.m
# Riot/Modules/Room/Members/RoomParticipantsViewController.m
# Riot/Modules/Spaces/SpaceList/SpaceListViewModel.swift
2022-02-21 17:20:58 +01:00
82d6968091
Merge branch 'gil/SP1_space_creation' into gil/5231_SP3-1_Update_room_settings_for_Spaces
...
# Conflicts:
# Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
# RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift
2022-02-21 15:27:05 +01:00
9eae7c02bb
Update activity indicators on leaving room
...
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com >
2022-02-18 13:31:21 +00:00
b0ee449c5d
Implement home screen activity indicators
2022-02-16 11:48:26 +00:00
df6d50b990
SP1.5: Let people know when rooms have moved #5228
...
- Update after review
2022-02-10 19:25:06 +01:00
d159d6d844
SP1.5: Let people know when rooms have moved #5228
...
- Update after review
2022-02-08 23:13:17 +01:00
fd765a9288
Merge branch gil/5230_SP2-Adding_Rooms_to_Spaces into gil/5231_SP3-1_Update_room_settings_for_Spaces
2022-02-05 21:43:29 +01:00
5025029843
Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces
2022-02-04 16:43:43 +01:00
63d3843bb0
Merge branch 'gil/SP1_space_creation' into gil/5228_let_people_know_when_rooms_have_moved
2022-02-04 14:31:26 +01:00
f4fa9e97e3
Merge branch 'develop' into gil/SP1_space_creation
...
# Conflicts:
# Riot/Modules/Room/RoomCoordinatorBridgePresenter.swift
# Riot/Modules/Room/RoomCoordinatorParameters.swift
# Riot/Modules/Room/RoomViewController.m
# Riot/Modules/TabBar/TabBarCoordinator.swift
2022-02-04 14:29:57 +01:00
308588736a
Update Riot/Modules/TabBar/TabBarCoordinator.swift
...
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com >
2022-02-03 21:01:14 +01:00
a13d5704dc
Merge branch 'develop' into ismail/5096_thread_notifications
2022-01-27 03:20:25 +03:00
9c5b83a1b3
Merge branch 'ismail/5068_start_thread' into ismail/5068_design_tweaks
2022-01-26 14:27:25 +03:00
f7694e27cb
Fix review remarks
2022-01-25 23:59:19 +03:00
d23f24b9ce
Merge branch 'gil/SP1_space_creation' into gil/5225_invite_to_space_in_room_landing
...
# Conflicts:
# 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
2022-01-24 19:36:02 +01:00
81405b4dd6
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications
2022-01-19 00:12:40 +03:00
805c1adcf4
Fix thread screen call button case
2022-01-18 03:13:22 +03:00
a8bcd8faa2
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
26a6060e3e
Merge branch 'ismail/5068_start_thread' into ismail/5096_thread_notifications
2022-01-17 11:39:25 +03:00
7e92b7cef5
Merge branch 'develop' into ismail/5068_start_thread
2022-01-17 11:35:10 +03:00
b4eee99d03
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
ea9183d70e
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
948dd8eec0
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications
2022-01-12 13:58:48 +03:00
49c787d987
vector-im/element-ios/issues/5298 - Various tweaks following code review.
2022-01-04 17:33:32 +02:00
9cd27d293c
Merge branch 'develop' into ismail/5068_start_thread
2022-01-04 15:28:19 +03:00
6fac497164
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
4b5490e1c7
Retain AnalyticsService. Fix coordinator retain cycle.
2021-12-16 17:02:58 +00:00
e642c7417e
Address most PR comments.
...
Update Podfile.lock
2021-12-16 17:01:23 +00:00
2ddb17ec7b
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
3cf030eb47
Add AnalyticsPrompt to SwiftUI target and replace old UIAlertController.
2021-12-16 17:01:22 +00:00
3aaa5ba24e
Merge branch 'gil/5228_let_people_know_when_rooms_have_moved' into gil/5224_space_creation
2021-12-15 14:52:57 +01:00
5b65bc3986
Let people know when rooms have moved element-ios
...
- Added coach message view
2021-12-15 14:51:26 +01:00
72ba8e6719
Invite to Space in room landing #5225
...
- Added participant invite coordinator
2021-12-08 23:21:55 +01:00
d3675d5d8b
Fix thread display configuration
2021-12-08 22:16:00 +03:00
124d808081
Add activity indicator when loading room and thread data sources
2021-11-30 00:59:59 +03:00
Gil Eluard
Andy Uhnak
Doug
Doug
ismailgulek
Stefan Ceriu