Commit Graph

2386 Commits

Author SHA1 Message Date
Gil Eluard 03de39d9d2 Merge branch 'spaces' into gil/4571_explore_rooms 2021-08-16 14:00:16 +02:00
Gil Eluard caf241f4d6 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 10:33:10 +02:00
Gil Eluard 3d0be2ddf7 [Spaces] Show suggested in room lists #4501
- Update after code review
2021-08-16 07:57:30 +02:00
Gil Eluard 50475d6f2a [Spaces] M10.7 Explore rooms #4571
- UI updates after design changes
2021-08-15 22:18:16 +02:00
Gil Eluard c310ed2dd5 Merge branch 'spaces' into gil/4571_explore_rooms
# Conflicts:
#	Riot/Modules/SideMenu/SideMenuCoordinator.swift
2021-08-12 17:17:24 +02:00
Gil Eluard 326253b2a9 Merge branch 'spaces' into gil/4501_show_suggested_in_room_lists 2021-08-12 14:35:25 +02:00
Gil Eluard 58bf6b63ae [Spaces] M10.9 Space menu #4494
- Update after code review
- Fixed some points of design review
2021-08-12 11:23:47 +02:00
Gil Eluard 16d951072b [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 be867d0598 [Spaces] M10.7 Explore rooms #4571
- Added an room detail screen
2021-08-06 15:51:51 +02:00
Gil Eluard 81c187bc84 [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 e197268ed2 [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
Gil Eluard bd08e565be Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists
# Conflicts:
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
2021-08-03 22:07:45 +02:00
Gil Eluard d82f9bb08f Merge branch 'spaces' into gil/4494_space_menu 2021-08-03 21:23:02 +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 d3a682eb9b [Spaces] M10.9 Space menu #4494
- Hide unimplemented actions
2021-08-03 20:13:47 +02:00
Doug b05809cb58 Merge branch 'develop' into doug/2368_allow_silent_notifications 2021-08-03 16:02:53 +01:00
Stefan Ceriu 8e23e24173 Voice messages - Updated recorded audio file name. 2021-08-03 14:59:44 +03:00
Stefan Ceriu c78bec9228 Voice messages - Increased recording state microphone icon size. 2021-08-03 14:59:44 +03:00
Stefan Ceriu bd8584f90c #4641 - Voice messages - always access local cache manager state from the internal work queue. 2021-08-03 14:59:44 +03:00
Gil Eluard df545056ab [Spaces] Show suggested in room lists #4501
- Preview suggested rooms
2021-08-03 13:45:22 +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 9aeb306832 Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu 2021-08-02 14:39:58 +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 7d0f73295c Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu 2021-07-30 07:02:40 +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 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 9114f46dc2 Merge branch 'develop' into gil/voice_messages_rc 2021-07-29 14:11:49 +02:00
Doug adb02c6323 Merge branch 'develop' into doug/2368_allow_silent_notifications 2021-07-29 11:38:57 +01:00
Doug f3beec64f0 Use MXWeakify/MXStrongifyAndReturnIfNil. 2021-07-29 11:37:19 +01:00
Doug c7af677984 Merge pull request #4621 from vector-im/doug/4620_fix_read_only_room_crash
Only set the voice message toolbar view on RoomInputToolbarView.
2021-07-29 11:11:28 +01:00
SBiOSoftWhare edab1e31a7 Merge branch 'develop' into steve/improve_recentsdatasource 2021-07-29 12:04:49 +02:00
Doug 506004af04 Move refreshLocalContacts call to viewDidAppear. 2021-07-29 09:37:14 +01:00
Doug e2466a3fca Request confirmation for contact sync on self rather than a non-existent presentedViewController. 2021-07-29 09:31:07 +01:00
Doug 18d6d1cf98 Only set the voice message toolbar view on RoomInputToolbarView. 2021-07-28 16:40:03 +01:00
Doug 3cfea31852 Move LegacyAppDelegate.refreshLocalContacts to ContactsTableViewController. 2021-07-28 16:07:07 +01:00
Doug cd807d718e Update notifications disabled alert. 2021-07-28 12:45:06 +01:00
Doug 60748a68dc Turn the toggle off if notifications were denied. 2021-07-28 11:38:49 +01:00
Doug bfc671b47b Merge pull request #4608 from vector-im/doug/4523_remove_contacts_from_people_tab
Remove contacts section from people tab
2021-07-28 10:53:58 +01: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 e4baa8916a Merge branch 'gil/4509_show_spaces_in_left_panel' into gil/4494_space_menu 2021-07-27 19:53:54 +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 00befeca34 [Spaces] Show spaces in left panel #4509
- filter rooms using `MXSpaceService` new API
- Added logs
2021-07-27 19:50:36 +02:00
Doug 1b184c988f Update string. 2021-07-27 17:38:40 +01:00
Doug 2eebd6ef71 Cherry-pick ceb5a35 and 949d3d9 as an additional option, rather than replacing the toggle. 2021-07-27 17:31:22 +01:00
Doug 7b52d9912f Fix compile error. 2021-07-27 17:15:43 +01:00
Doug 75aa3337de Merge branch 'develop' into doug/2368_2_allow_silent_notifications 2021-07-27 16:52:30 +01:00
Doug 4127a5d476 Remove peopleCellDataArray from total item count. 2021-07-27 16:06:41 +01:00
Doug 3249f80cfb Remove old MXKRecentsDataSource methods. 2021-07-27 15:59:36 +01:00
Doug 6e97b289aa Remove old conformances. 2021-07-27 14:53:58 +01:00
Doug 5824fa2bbf Allow recentsTableView to use recentsDataSource now that there are no contacts to insert.
Remove all unnecessary datasource/delegate methods.
2021-07-27 14:51:10 +01:00