pavelbannov
b14d6c8ef0
# 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 |
||
---|---|---|
.. | ||
install | ||
run | ||
scripts | ||
start | ||
tools | ||
build.backend.bat | ||
build.backend.docker.bat | ||
build.backend.docker.ps1 | ||
build.backend.docker.sh | ||
build.bat | ||
build.document.server.docker.bat | ||
build.document.server.docker.ps1 | ||
build.frontend.bat | ||
build.sh | ||
build.static.bat | ||
buildAndDeploy.bat | ||
clear.backend.docker.bat | ||
clear.backend.docker.ps1 | ||
clear.backend.docker.sh | ||
createMigrations.bat | ||
Jenkinsfile | ||
publish.bat | ||
run.backend.translations.tests.bat | ||
run.backend.translations.tests.sh | ||
run.e2e.test.bat | ||
run.e2e.translations.tests.bat | ||
run.e2e.translations.tests.personal.bat | ||
run.translations.spellcheck.test.bat | ||
run.translations.spellcheck.test.sh | ||
run.translations.tests.bat | ||
run.translations.tests.sh | ||
runasadmin.bat | ||
runMigrations.bat | ||
runMigrations.sh | ||
runMigrations.standalone.bat |