Ilya Oleshko e531654c54 Merge branch 'hotfix/v1.1.2' into develop ... # Conflicts: # build/build.backend.docker.ps1 # build/build.backend.docker.sh # common/ASC.Api.Core/ASC.Api.Core.csproj # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/Context/SecurityContext.cs # common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs # common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj # common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs # config/nginx/onlyoffice.conf # packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js # packages/client/src/pages/AccountsHome/Section/Filter/index.js # packages/client/src/pages/PortalSettings/categories/integration/index.js # packages/common/api/files/index.js # packages/components/.storybook/preview.js # packages/components/package.json # packages/editor/src/server/lib/helpers/index.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/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs # products/ASC.Files/Server/Api/OperationController.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs # yarn.lock		2023-08-11 12:47:44 +03:00
..
public	Merge branch 'develop' into feature/deep-link	2023-07-25 12:54:36 +03:00
scripts	Web: fix build	2023-02-06 19:15:04 +03:00
src	Merge branch 'hotfix/v1.1.2' into develop	2023-08-11 12:47:44 +03:00
tests	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
webpack	Web: Fixed the path to the CSS file	2023-08-04 15:25:28 +05: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 'hotfix/v1.1.2' into develop	2023-08-01 17:56:22 +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