DocSpace-buildtools/build
pavelbannov bc6b0d9e0d Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Billing/ITariffService.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/EmailSenderSink.cs
#	common/ASC.Core.Common/Notify/JabberSenderSink.cs
#	common/ASC.Core.Common/Notify/PushSenderSink.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
#	migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Files.jsx
#	packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/security/index.js
#	packages/client/src/pages/Profile/Section/Header/index.js
#	packages/common/store/SettingsStore.js
#	packages/components/drop-down/index.js
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/FeedController.cs
#	web/ASC.Web.Api/Api/PaymentsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Core/DnsSettings.cs
#	web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
#	web/ASC.Web.Api/GlobalUsings.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
#	yarn.lock
2023-08-28 18:53:10 +03:00
..
install Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +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 Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
build.backend.docker.sh Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03: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.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