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
..
common	Add a check for localhost in product-configuration	2023-09-21 16:52:16 +04:00
deb/debian	fix Bug 63398 - Upgrade elasticsearch to version 7.16.3	2023-09-19 20:27:18 +04:00
docker	Merge branch 'hotfix/v1.1.3' into develop	2023-09-25 10:53:06 +03:00
OneClickInstall	fix Bug 63398 - Upgrade elasticsearch to version 7.16.3	2023-09-19 20:27:18 +04:00
RadicalePlugins	moved from ddf515b8	2022-06-17 18:46:16 +03:00
rpm/SPECS	Add samesite variable predefinition	2023-09-15 13:49:35 +05:00
snap
win	Fix issue with starting Elasticsearch service (#1762)	2023-09-22 18:29:40 +05:00
install.bat	install.bat requires administrative privileges	2022-08-22 18:52:13 +03:00
uninstall.bat	winsw: update	2022-03-04 12:14:46 +03:00