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
..
public	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
scripts	Web: fix build	2023-02-06 19:15:04 +03:00
src	Merge branch 'master' into develop	2023-08-01 14:39:31 +03:00
tests	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
webpack	Web: fix build	2023-02-06 19:15:04 +03:00
.babelrc	Web: Login: fixed styled-components warnings	2022-08-30 00:01:46 +03:00
.gitattributes	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
.gitignore	Web:Login: add autoGeneratedTranslations.ts to gitignore file	2023-02-03 19:08:46 +03:00
codecept.conf.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
Dockerfile	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.d.ts	Fix Bug 62511: Uninformative error when session time expires	2023-05-16 15:53:40 +03:00
jsconfig.json	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
package.json	Merge branch 'master' into develop	2023-08-01 14:39:31 +03:00
steps_file.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
steps.d.ts	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
tsconfig.json	Web: Fix react types warnings	2022-09-02 17:15:05 +03:00