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
..
files	Merge branch 'master' into develop	2023-08-01 14:39:31 +03:00
groups	Web: Removed .json from all api urls (docker issue)	2023-04-17 13:47:34 +04:00
modules
oforms	Web: Common: added oforms filter	2022-08-29 11:28:05 +03:00
people	Web: Added check for filter instead of "instanceof".	2023-05-29 17:14:50 +03:00
plugins	Web:Common:Api: add 'request' func to plugins api	2022-08-24 19:53:33 +03:00
portal	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
rooms	Merge branch 'develop' into feature/public-room	2023-07-25 13:01:21 +03:00
settings	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
user	Web: Removed .json from all api urls (docker issue)	2023-04-17 13:47:34 +04:00
client.js
index.js	Web: Common: added oforms filter	2022-08-29 11:28:05 +03:00