Commit Graph

492 Commits

Author SHA1 Message Date
Anderas fda6ba2862 Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
Anderas 7c3a86c24d Merge pull request #5690 from vector-im/andy/5603_room_indicators
Room activity indicators
2022-03-01 13:08:29 +00:00
Gil Eluard 72e280652a Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Gil Eluard 0abef4312e Merge branch 'develop' into gil/SP1_space_creation 2022-03-01 10:15:13 +01:00
Doug 4af2e71760 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
Doug 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
Gil Eluard c84285955b SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
Gil Eluard bca69bb7c8 SP3.1: Update room settings for Spaces #5231
- Update after review
2022-02-28 16:07:09 +01:00
Doug dcca446664 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
Doug 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
Andy Uhnak 4617b3ed69 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Andy Uhnak 559bb88ae4 Room user indicators
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-25 10:47:53 +00:00
Anderas c9ef4ac58b Merge pull request #5630 from vector-im/andy/5605_leave_room
Update activity indicators on leaving room
2022-02-25 09:52:03 +00:00
Anderas a5f3987bd1 Merge pull request #5630 from vector-im/andy/5605_leave_room
Update activity indicators on leaving room
2022-02-25 09:52:03 +00:00
David Langley 9c53cfd4e3 Use protocol to get title from child VCs. 2022-02-23 11:41:05 +00:00
David Langley 3fd31f3c7b Use protocol to get title from child VCs. 2022-02-23 11:41:05 +00:00
Andy Uhnak 75d3d30c12 Rename properties and arguments 2022-02-22 16:44:22 +00:00
Andy Uhnak c9c8438250 Rename properties and arguments 2022-02-22 16:44:22 +00:00
Andy Uhnak 5bb32d4971 Rename Activity to UserIndicator 2022-02-22 16:14:03 +00:00
Andy Uhnak 712d64204c Rename Activity to UserIndicator 2022-02-22 16:14:03 +00:00
Gil Eluard f9b008e684 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
Gil Eluard 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
Gil Eluard ff685a4c37 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
Gil Eluard 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
Gil Eluard b6fca44b8f 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
Gil Eluard 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
Andy Uhnak a5ae727f84 Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Andy Uhnak 9eae7c02bb Update activity indicators on leaving room
Signed-off-by: Andy Uhnak <andyuhnak@gmail.com>
2022-02-18 13:31:21 +00:00
Doug e167f9c61a Move presentation of the loading spinner into AuthenticationCoordinator for new users.
Also moves key verification out of a bridge presenter in AuthenticationVC and into the AuthenticationCoordinator.
2022-02-17 17:31:43 +00:00
Doug 2256b522ab Move presentation of the loading spinner into AuthenticationCoordinator for new users.
Also moves key verification out of a bridge presenter in AuthenticationVC and into the AuthenticationCoordinator.
2022-02-17 17:31:43 +00:00
Andy Uhnak 4d86245033 Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
Andy Uhnak b0ee449c5d Implement home screen activity indicators 2022-02-16 11:48:26 +00:00
Gil Eluard 538f49d004 SP1.5: Let people know when rooms have moved #5228
- Update after review
2022-02-10 19:25:06 +01:00
Gil Eluard df6d50b990 SP1.5: Let people know when rooms have moved #5228
- Update after review
2022-02-10 19:25:06 +01:00
Stefan Ceriu 1ab7643de1 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Stefan Ceriu 4b1eb75fd3 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard a55782062c SP1.5: Let people know when rooms have moved #5228
- Update after review
2022-02-08 23:13:17 +01:00
Gil Eluard d159d6d844 SP1.5: Let people know when rooms have moved #5228
- Update after review
2022-02-08 23:13:17 +01:00
Gil Eluard ae27b06f0d 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
Gil Eluard 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
Gil Eluard 57999c30db Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard 5025029843 Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard 23a898a1a4 Merge branch 'gil/SP1_space_creation' into gil/5228_let_people_know_when_rooms_have_moved 2022-02-04 14:31:26 +01:00
Gil Eluard 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
Gil Eluard 0ae38858da 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
Gil Eluard 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
Gil Eluard f50d691e4d Update Riot/Modules/TabBar/TabBarCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-02-03 21:01:14 +01:00
Gil Eluard 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
ismailgulek c358f10272 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-01 01:23:00 +03:00
ismailgulek cf2420669f Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-01 01:23:00 +03:00