IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
d762d746fa
DocSpace-buildtools/build
History
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
..
install Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
run added slnf 2022-11-23 18:26:50 +03:00
scripts removed build urlshortener.bat 2022-11-24 13:08:21 +03:00
start Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
tools
build.backend.bat added slnf 2022-11-23 18:26:50 +03:00
build.backend.docker.bat Build: Fixed .bat args 2023-03-24 09:57:31 +03:00
build.backend.docker.ps1 Build: Docker: Dev: Added param --dns 2023-09-21 18:11:24 +04:00
build.backend.docker.sh Build: Docker: Dev: Added param --dns 2023-09-21 18:11:24 +04:00
build.bat refactoring build script 2021-11-15 19:36:09 +03:00
build.document.server.docker.bat Added run document server docker for development. 2022-11-29 18:50:50 +03:00
build.document.server.docker.ps1 Turn on JWT 2023-02-27 18:52:45 +04:00
build.frontend.bat fixed build.bat 2021-11-21 16:46:09 +03:00
build.sh removed build urlshortener.bat 2022-11-24 13:08:21 +03:00
build.static.bat Web: Removed useless for static build 2022-09-02 11:31:35 +03:00
buildAndDeploy.bat refactoring build scripts 2021-12-24 16:47:37 +03:00
clear.backend.docker.bat Build: Added .bat files: build.backend.docker.bat, start.backend.docker.bat, stop.backend.docker.bat, restart.backend.docker.bat, clear.backend.docker.bat 2022-11-24 15:00:42 +03:00
clear.backend.docker.ps1 Build: Docker: Dev: Added build/clean base images by default for windows 2023-08-09 12:51:06 +03:00
clear.backend.docker.sh Build: Docker: Dev: Added build/clean base images by default 2023-08-09 12:29:39 +04:00
createMigrations.bat fixed createMigrations.bat 2022-08-16 17:46:29 +03:00
Jenkinsfile added slnf 2022-11-23 18:26:50 +03:00
publish.bat
run.backend.translations.tests.bat add Backend.Translations.Tests 2023-05-03 23:31:45 +03:00
run.backend.translations.tests.sh Create run.backend.translations.tests.sh 2023-09-12 19:41:06 +04:00
run.e2e.test.bat Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
run.e2e.translations.tests.bat Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
run.e2e.translations.tests.personal.bat Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
run.translations.spellcheck.test.bat Translation: Tests: Fix spell check test 2023-04-14 18:21:48 +04:00
run.translations.spellcheck.test.sh Translation: Tests: Fix spell check test 2023-04-14 18:21:48 +04:00
run.translations.tests.bat Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
run.translations.tests.sh Fix frontend tests running 2023-03-09 12:12:31 +04:00
runasadmin.bat refactoring build script 2021-11-15 19:36:09 +03:00
runMigrations.bat merge from develop 2022-12-01 14:52:46 +03:00
runMigrations.sh added slnf 2022-11-23 18:26:50 +03:00
runMigrations.standalone.bat Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00