Commit Graph

1156 Commits

Author SHA1 Message Date
Gil Eluard c49fa993f3 Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-08-03 21:22:43 +02:00
Gil Eluard cf456ad36b Merge branch 'develop' into spaces
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-08-03 21:22:43 +02:00
Gil Eluard 3985f079ef [Spaces] Show suggested in room lists #4501
- Preview suggested rooms
2021-08-03 13:45:22 +02:00
Gil Eluard df545056ab [Spaces] Show suggested in room lists #4501
- Preview suggested rooms
2021-08-03 13:45:22 +02:00
Gil Eluard b50ff1b290 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists 2021-08-02 14:40:17 +02:00
Gil Eluard ca88a8f9cf Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists 2021-08-02 14:40:17 +02:00
Gil Eluard 20b199c14e [Spaces] Show spaces in left panel #4509
- update after review
2021-08-02 09:57:30 +02:00
Gil Eluard a1b277a914 [Spaces] Show spaces in left panel #4509
- update after review
2021-08-02 09:57:30 +02:00
Gil Eluard 4833be9452 [Spaces] Show spaces in left panel #4509
- moved space filtering to MatrixKit
2021-07-30 06:56:37 +02:00
Gil Eluard 2ef916e38b [Spaces] Show spaces in left panel #4509
- moved space filtering to MatrixKit
2021-07-30 06:56:37 +02:00
Gil Eluard 2a558bd240 [Spaces] Show suggested in room lists #4501
- Show suggested rooms section in home screen (no actions)
- Show suggested rooms section in rooms screen (no actions)
2021-07-29 23:24:34 +02:00
Gil Eluard 3c1084963d [Spaces] Show suggested in room lists #4501
- Show suggested rooms section in home screen (no actions)
- Show suggested rooms section in rooms screen (no actions)
2021-07-29 23:24:34 +02:00
Gil Eluard 9c4c3ec892 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-07-27 20:14:53 +02:00
Gil Eluard becd524288 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-07-27 20:14:53 +02:00
Gil Eluard 20fe74f9f9 [Spaces] Show spaces in left panel #4509
- filter rooms using `MXSpaceService` new API
2021-07-27 19:53:41 +02:00
Gil Eluard 030f85917f [Spaces] Show spaces in left panel #4509
- filter rooms using `MXSpaceService` new API
2021-07-27 19:53:41 +02:00
Gil Eluard 5dac1ec090 [Spaces] Show spaces in left panel #4509
- filter rooms using `MXSpaceService` new API
- Added logs
2021-07-27 19:50:36 +02:00
Gil Eluard 00befeca34 [Spaces] Show spaces in left panel #4509
- filter rooms using `MXSpaceService` new API
- Added logs
2021-07-27 19:50:36 +02:00
Gil Eluard b42d4bd3f8 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists 2021-07-26 12:03:49 +02:00
Gil Eluard f83a8beb51 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists 2021-07-26 12:03:49 +02:00
Gil Eluard 18a8bd088e Merge branch 'element_4509' into gil/4509_show_spaces_in_left_panel 2021-07-26 12:03:04 +02:00
Gil Eluard f61a5751d2 Merge branch 'element_4509' into gil/4509_show_spaces_in_left_panel 2021-07-26 12:03:04 +02:00
Gil Eluard fe0c81cdc6 Merge branch 'spaces' into element_4509 2021-07-26 10:42:49 +02:00
Gil Eluard bf8e0d0d18 Merge branch 'spaces' into element_4509 2021-07-26 10:42:49 +02:00
SBiOSoftWhare a75ee5e354 RecentsDataSource: Factorize section reset management and do not make it in refreshRoomsSection method. 2021-07-23 10:42:08 +02:00
SBiOSoftWhare 67e9e4a9fa RecentsDataSource: Factorize section reset management and do not make it in refreshRoomsSection method. 2021-07-23 10:42:08 +02:00
Gil Eluard b90247543a [Spaces] Show suggested in room lists #4501
- Request space suggested rooms in `RecentsDataSource`
2021-07-22 22:35:15 +02:00
Gil Eluard 5ed117e054 [Spaces] Show suggested in room lists #4501
- Request space suggested rooms in `RecentsDataSource`
2021-07-22 22:35:15 +02:00
Doug 18eeec2a05 Merge branch 'develop' into doug/4521_remove_directory_from_rooms_tab 2021-07-22 14:37:25 +01:00
Doug c340e60886 Merge branch 'develop' into doug/4521_remove_directory_from_rooms_tab 2021-07-22 14:37:25 +01:00
Gil Eluard ca20af2bd2 [Spaces] Show spaces in left panel #4509
- Display the none hierarchical list of spaces in the left panel
- Space switching when new space selected
- Refresh space list and recents data after sync
2021-07-15 14:10:01 +02:00
Gil Eluard 5937917c01 [Spaces] Show spaces in left panel #4509
- Display the none hierarchical list of spaces in the left panel
- Space switching when new space selected
- Refresh space list and recents data after sync
2021-07-15 14:10:01 +02:00
Doug 2bd59ab326 Merge branch 'develop' into doug/fix_warnings
# Conflicts:
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
2021-07-12 17:54:34 +01:00
Doug cec15f8f1d Merge branch 'develop' into doug/fix_warnings
# Conflicts:
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
2021-07-12 17:54:34 +01:00
langleyd bbf93f5c2b Fix logging, add "Notify me for" label, fix theme on avatar and add changes 2021-07-08 20:54:32 +01:00
langleyd 816513cee6 Fix logging, add "Notify me for" label, fix theme on avatar and add changes 2021-07-08 20:54:32 +01:00
Doug 990da54907 Remove uninitialised header views. 2021-07-07 15:05:40 +01:00
Doug 6efff0af1d Remove uninitialised header views. 2021-07-07 15:05:40 +01:00
Doug 9bcbeffc50 Remove custom section header for room directory from RecentsDataSource. 2021-07-07 14:31:52 +01:00
Doug b8a4a526b3 Remove custom section header for room directory from RecentsDataSource. 2021-07-07 14:31:52 +01:00
Doug 1123d356b7 Don't include directorySection in RecentsDataSource when in RecentsDataSourceModeRooms mode. 2021-07-07 11:48:23 +01:00
Doug 542533aa1b Don't include directorySection in RecentsDataSource when in RecentsDataSourceModeRooms mode. 2021-07-07 11:48:23 +01:00
langleyd 9225b910c7 Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd 87710ca8c3 Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd a23d81e483 Keep old mute behaviour enabled on slide menu and long press when new build setting is not enabled. 2021-07-06 11:59:54 +01:00
langleyd fe6a1953bd Keep old mute behaviour enabled on slide menu and long press when new build setting is not enabled. 2021-07-06 11:59:54 +01:00
langleyd d24e0c220d spacing and cleanup dead code 2021-07-05 16:49:06 +01:00
langleyd 0fb949b294 spacing and cleanup dead code 2021-07-05 16:49:06 +01:00
langleyd 8bfef45c9e Add entry points at long press on home view and slide on recents. 2021-07-02 20:19:46 +01:00
langleyd 3f7d45100c Add entry points at long press on home view and slide on recents. 2021-07-02 20:19:46 +01:00