pavelbannov b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop ... # Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Core/ITenantService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Data.Storage/StorageHandler.cs # common/ASC.FederatedLogin/ASC.FederatedLogin.csproj # config/appsettings.json # config/nlog.config # migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs # packages/client/src/pages/Confirm/sub-components/createUser.js # packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js # packages/common/components/MoreLoginModal/index.tsx # packages/login/src/client/components/sub-components/LoginForm.tsx # products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.People/Server/Api/ThirdpartyController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Core/CspSettingsHelper.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs # yarn.lock		2023-09-25 10:53:06 +03:00
..
4testing-multi-build.yml	Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.2	2023-08-28 11:58:36 +03:00
build_packages.yml	Optimize packages build action (#1731)	2023-09-12 17:55:16 +05:00
build-ffvideo.yml	Modify github action build ffvideo (#1434)	2023-05-23 19:09:38 +05:00
build-runtime-images.yml	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00
oci-release.yml	fix Bug 63666 - Add priority use of OCI scripts with S3	2023-08-23 16:51:57 +05:00
storybook-publish.yml	Add githubactiion job for storybook publishing (#1307)	2023-03-15 19:43:01 +05:00