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
..
public	Web: move ExpiredLink translate to Common	2023-09-20 17:35:38 +03:00
scripts	Web: fix build	2023-02-06 19:15:04 +03:00
src	Merge branch 'hotfix/v1.1.3' into develop	2023-09-25 10:53:06 +03:00
tests
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
.gitignore	Web:Login: add autoGeneratedTranslations.ts to gitignore file	2023-02-03 19:08:46 +03:00
codecept.conf.js
Dockerfile
index.d.ts	Login: add type	2023-09-13 13:08:44 +03:00
jsconfig.json
package.json	Merge branch 'hotfix/v1.1.3' into develop	2023-09-05 09:45:42 +04:00
steps_file.js
steps.d.ts
tsconfig.json	Web: Fix react types warnings	2022-09-02 17:15:05 +03:00