Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
14488 commits 46 branches 261 tags 144 MiB
Commit graph

40 commits

Author SHA1 Message Date
Gil Eluard
f87d04418c
Update Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift 
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
 2022-02-27 22:57:27 +01:00
Gil Eluard
d8c9d933e8 Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
 2022-02-25 14:31:22 +01:00
Gil Eluard
8bd67bdc52 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
8fa0a673d6 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
df25a2ce2f 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
7b92f8a261 SP2: Adding Rooms to Spaces #523o 
- update after review
 2022-02-17 14:02:52 +01:00
Gil Eluard
b601d6086e SP2: Adding Rooms to Spaces #523o 
- update after review
 2022-02-17 10:47:44 +01:00
Gil Eluard
06590ff880 SP2: Adding Rooms to Spaces #523o 
- update after review
 2022-02-15 22:23:12 +01:00
Stefan Ceriu
4bd5c12f73 Fixed various project warnings. Completely disabled nullability checks, went down from ~20k to 195. 2022-02-10 08:43:18 +02:00
Gil Eluard
e984e8a44a SP3.2: Long press on rooms in space room lists #5232 
- Small tweaks
 2022-02-06 21:29:25 +01:00
Gil Eluard
f462a6e3d0 Merge branch 'gil/5231_SP3-1_Update_room_settings_for_Spaces' into gil/5232_SP3-2_Long_press_on_rooms_in_space_room_lists 
# Conflicts:
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewModel.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
 2022-02-06 21:22:28 +01:00
Gil Eluard
96cf359703 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
97e22f50aa SP2: Adding Rooms to Spaces #523o 
- check permission before adding room
- Added join button in explore room screens
 2022-02-05 08:20:39 +01:00
Gil Eluard
601ba0b472 Merge branch gil/SP1_space_creation into gil/5230_SP2-Adding_Rooms_to_Spaces 2022-02-04 16:43:43 +01:00
Gil Eluard
f322368a46 SP1.2: Invite to Space in room landing element-ios#5225 
- Update after review
 2022-02-03 23:44:07 +01:00
Gil Eluard
afa77deef7 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
Gil Eluard
2c5ed41f02 SP3.2: Long press on rooms in space room lists #5232 
- Added context menu for spaces and rooms in Explore rooms screen
 2022-01-17 16:44:40 +01:00
Gil Eluard
be4cd455f1 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
Gil Eluard
cdb4cc131e 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
Stefan Ceriu
eead770633 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Gil Eluard
81951176c3 SP2: Adding Rooms to Spaces element-ios#5230 
- Implemented designs with new & existing tabs in a bottom sheet
- Replaced rough edge warnings from space panel overflow with working journeys
 2021-12-23 14:08:00 +01:00
Gil Eluard
acf32fd77a Invite to Space in room landing #5225 
- UI tweaks for members and explore rooms screens
 2021-12-15 15:53:21 +01:00
Gil Eluard
cf453feb02 Implement FAB journeys & rough edge warnings element-ios#5226 
- List of Space members with search
- Invite interactions
- Join room from list
- Implement add room button, with rough edge warning.
 2021-12-10 09:59:10 +01:00
Gil Eluard
26bf2a3719 Invite to Space in room landing #5225 
- Added participant invite coordinator
 2021-12-08 23:21:55 +01:00
Gil Eluard
779909eac4 Support pagination in the Space Summary API 
- Update after review
 2021-10-27 10:27:13 +02:00
Gil Eluard
b192123b9f Support pagination in the Space Summary API 
- Revert test tweaks
 2021-10-26 14:44:51 +02:00
Gil Eluard
d1abed3844 Support pagination in the Space Summary API 
- Move back to default iOS activity indicator
 2021-10-26 14:40:51 +02:00
Gil Eluard
77371c75de Support pagination in the Space Summary API 2021-10-12 20:48:30 +02:00
Gil Eluard
e6b72a778a [spaces] several fixes for pre release 
- [When switching spaces, user and room tabs are not populated](https://github.com/vector-im/element-ios/issues/4889)
- [Explore rooms list in space has odd ordering](https://github.com/vector-im/element-ios/issues/4890)
- Fixed Coming Soon error for Explore rooms
 2021-09-22 16:57:31 +02:00
Gil Eluard
8ba6c55a87 Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
 2021-09-15 14:42:04 +02:00
Gil Eluard
7b539ecde3 Merge branch 'gil/4571_explore_rooms' into gil/4682_browsing_users_in_a_space 
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
 2021-09-13 10:23:21 +02:00
Gil Eluard
50ffa5b5a7 [Spaces] M10.7 Explore rooms #4571 
- Update after code review
 2021-09-13 10:06:36 +02:00
Gil Eluard
4e3e803943 [Spaces] M10.8 Browsing users in a space #4682 
- Renamed coordinators
 2021-09-02 09:34:25 +03:00
Gil Eluard
99caa08860 [Spaces] M10.7 Explore rooms #4571 
- Update after review
 2021-09-01 18:12:08 +03:00
Gil Eluard
3b1c0119b7 [Spaces] M10.7 Explore rooms #4571 
- Update after design review
 2021-08-16 15:44:44 +02:00
Gil Eluard
a968bab33c [Spaces] M10.7 Explore rooms #4571 
- UI updates after design changes
 2021-08-15 22:18:16 +02:00
Gil Eluard
1cb9a6b691 [Spaces] M10.7 Explore rooms #4571 
- Added suggested tag to the explore rooms cell
- Implemented join feature
 2021-08-09 17:05:36 +02:00
Gil Eluard
53b751a707 [Spaces] M10.7 Explore rooms #4571 
- Added an room detail screen
 2021-08-06 15:51:51 +02:00
Gil Eluard
3226a49e42 [Spaces] M10.7 Explore rooms #4571 
- Added the ability to navigate through subspaces within the Explore Rooms screen
 2021-08-05 17:04:10 +02:00
Gil Eluard
66b4ccbe67 [Spaces] M10.7 Explore rooms #4571 
- Implemented navigation between space context menu and Explore Room screen
- Populate Explore rooms screen with the first level of space children
 2021-08-05 14:36:38 +02:00