Ilya Oleshko 51fb13d035 Merge branch 'master' into develop ... # Conflicts: # packages/client/src/pages/Files.jsx # packages/common/components/Navigation/Navigation.js # packages/common/components/Navigation/sub-components/control-btn.js # packages/common/components/Navigation/sub-components/plus-btn.js # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs # products/ASC.Files/Server/Api/OperationController.cs # yarn.lock		2023-08-01 14:39:31 +03:00
..
controllers	Socket: Added changeQuotaUsedValue and changeQuotaFeatureValue	2023-03-28 22:27:15 +04:00
hubs	SocketIO: FilesHub: fixed for anonymous user	2023-05-12 14:58:23 +03:00
middleware	Merge branch 'develop' into feature/public-room-backend	2023-06-02 16:42:16 +03:00
log.js	Node: Services: Added new logLevel param	2023-07-24 14:03:52 +04:00
portalManager.js	removed x-rewriter-url	2023-05-03 20:25:50 +03:00
requestManager.js	SocketIO: fix ipv4	2022-11-14 18:00:16 +03:00