Commit Graph

39131 Commits

Author SHA1 Message Date
2b112d9344 Store: added IDataStoreValidator 2023-10-20 17:25:21 +03:00
bb4873d382
Merge pull request #24 from ONLYOFFICE/feature/usernameregex
Feature/usernameregex
2023-10-20 18:13:42 +04:00
bc9f3f5c07 Cfg: fixed UserNameRegex 2023-10-20 16:31:19 +03:00
38dd71539b Cfg: added UserNameRegex 2023-10-20 14:47:57 +03:00
5cb03f3ba5 Fix run on Windows 2023-10-19 17:28:24 +04:00
cc8c1c72ce Replaced call to run 2023-10-19 17:27:43 +04:00
70ca81008b Added clear.backend.docker.py 2023-10-19 17:12:38 +04:00
ca504f9452 Fix running on macOS 2023-10-19 17:11:37 +04:00
80f1ecea84 Added start/stop/restart docker containers runner on python 2023-10-19 14:27:45 +03:00
Valeria Bagisheva
b7553b701a
Add cron build (#23) 2023-10-19 13:31:07 +03:00
41cb7ab9a7 Change getting arch_name 2023-10-19 14:07:50 +04:00
fc7561d4e7 Added stop dev docker python script 2023-10-19 12:55:30 +04:00
b820deabc9 Replaced netifaces 2023-10-19 12:08:35 +04:00
0075961d5a Added new python scripts 2023-10-18 18:07:33 +04:00
Nasrullo Nurullaev
b2f2890fbc
Increase the generation of MACHINE_KEY length (#21) 2023-10-17 14:41:21 +03:00
43401255da
Modify docker tag for build from develop (#20) 2023-10-17 13:12:43 +03:00
Nasrullo Nurullaev
8773eeeb29
fix Bug 64516 - Fix issue with infinite logs in EventViewer (#19) 2023-10-17 12:17:46 +03:00
Nasrullo Nurullaev
5971f66ff6
Fix issue with machinekey when updating DocSpace (#18) 2023-10-17 11:02:12 +03:00
04d28e7b73
Feature/doc space enterprise (#17)
* Add Enterprise build and bundled prerequisites

* Small fixes

* Small fixes

* Fix issue with Licenses

* Revert changes with License_Redist.rtf

---------

Co-authored-by: Nasrullo Nurullaev <nasrullo.nurullaev@onlyoffice.com>
2023-10-16 17:57:50 +03:00
Nasrullo Nurullaev
46d3c130a2
Add Enterprise build and bundled prerequisites (#15)
* Add Enterprise build and bundled prerequisites

* Small fixes

* Small fixes

* Fix issue with Licenses

* Revert changes with License_Redist.rtf
2023-10-16 15:13:02 +03:00
84ad8502b3 Fix running client translations tests 2023-10-16 15:38:33 +04:00
7952dea531 Update +x permission 2023-10-15 13:12:13 +04:00
7079467cc8
Add gzip config level to router (#16)
* Modify gzip config level and proxied

* Modify gzip config

* Modify gzip config
2023-10-12 18:44:39 +03:00
e7c6fe6b79 Fix openresty logging error in nginx file 2023-10-12 17:11:05 +04:00
d2ee9f8a9f Fixed parameters for ps1 script 2023-10-12 13:56:16 +03:00
Valeria Bagisheva
fc0c907f2c
Build from the 'develop' branch via cron (#14)
* Test every 5 minute

* Delete recursive submodules

* Set ONLYOFFICE variables
2023-10-12 11:21:00 +03:00
1ef3c6fc6a Added help (-h) and changed params 2023-10-11 18:27:21 +04:00
28dffc0d8e Added env MIGRATION_TYPE 2023-10-11 18:26:30 +04:00
6f64729531
Fix the use of the default openresty config (#13) 2023-10-10 18:18:22 +03:00
d7322464af
Correct the paths for downloading OCI scripts (#11) 2023-10-10 18:16:28 +03:00
ca41aedeb8
Refactoring build rpm packages (#9) 2023-10-10 16:48:27 +03:00
5095fa01d7
Add fix for git clone building images (#6)
* Fix git clone for building docker image

* Modify git clone feature for docker build
2023-10-10 09:48:01 +03:00
Nasrullo Nurullaev
a616b3b6d2
Refactor windows build (#10)
* Refactor builds for windows

* Change web build directories

* Directory fix

* build to buildtools

* Small fixes

* Fix issue with building Utils.csproj

* Fix issue with nuget packages

* Remove sed temp files from directory
2023-10-09 15:38:14 +03:00
46127d3b7e
Fix incorrect log level substitution (#8) 2023-10-09 10:54:49 +03:00
DmitrySychugov
7f302d777d Merge branch 'develop' into feature/management 2023-10-05 19:18:55 +05:00
0142e65f97 Fix dnsmasq run 2023-10-05 17:48:54 +04:00
897ccd9033
Add the ability to set a pass for redis in router (#5)
* Add the ability to set a pass for redis in router

* Add redis_password to compose
2023-10-05 16:16:10 +03:00
DmitrySychugov
669c03d3cb Merge branch 'feature/management' of github.com:ONLYOFFICE/DocSpace-buildtools into feature/management
# Conflicts:
#	build.backend.docker.sh
#	build.static.bat
2023-10-04 21:10:46 +05:00
DmitrySychugov
0266838db5 Merge branch 'develop' into feature/management
# Conflicts:
#	build.backend.docker.sh
#	build.static.bat
#	common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
#	common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
#	common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
#	common/ASC.Data.Backup.Core/Service/BackupService.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ApiSystem/Controllers/SettingsController.cs
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Models/SettingsModel.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
#	common/services/ASC.Data.Backup/GlobalUsings.cs
#	frontend.code-workspace
#	frontend.macos.code-workspace
#	migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	package.json
#	packages/client/package.json
#	packages/client/src/components/MainBar/index.js
#	packages/client/src/components/NavMenu/index.js
#	packages/client/src/components/NavMenu/sub-components/header-nav.js
#	packages/client/src/components/NavMenu/sub-components/header.js
#	packages/client/src/pages/Confirm/sub-components/auth.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/common/sub-components/loaderWhiteLabel.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-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/data-management/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/client/webpack.config.js
#	packages/common/api/index.js
#	packages/common/api/portal/index.js
#	packages/common/components/Article/index.js
#	packages/common/components/Article/sub-components/article-apps.js
#	packages/common/components/Article/sub-components/article-header.js
#	packages/common/components/Article/sub-components/article-hide-menu-button.js
#	packages/common/components/Article/sub-components/article-profile.js
#	packages/common/store/AuthStore.js
#	packages/common/store/SettingsStore.js
#	packages/common/utils/axiosClient.js
#	packages/common/utils/whiteLabelHelper.js
#	packages/components/context-menu/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
#	public/locales/en/Common.json
#	public/scripts/config.json
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	yarn.lock
2023-10-04 21:06:09 +05:00
36caae2baa
Fix entrypoint in nginx (#4) 2023-10-04 17:05:30 +03:00
bc226967a9 Removed useless files from other repositories 2023-10-04 15:39:19 +04:00
1b28e9e34f Merge branch 'develop' into feature/management
# Conflicts:
#	build.backend.docker.sh
#	build.static.bat
#	common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
#	common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
#	common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
#	common/ASC.Data.Backup.Core/Service/BackupService.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ApiSystem/Controllers/SettingsController.cs
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Models/SettingsModel.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
#	common/services/ASC.Data.Backup/GlobalUsings.cs
#	frontend.code-workspace
#	frontend.macos.code-workspace
#	migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	package.json
#	packages/client/package.json
#	packages/client/src/components/MainBar/index.js
#	packages/client/src/components/NavMenu/index.js
#	packages/client/src/components/NavMenu/sub-components/header-nav.js
#	packages/client/src/components/NavMenu/sub-components/header.js
#	packages/client/src/pages/Confirm/sub-components/auth.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/common/sub-components/loaderWhiteLabel.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-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/data-management/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/client/webpack.config.js
#	packages/common/api/index.js
#	packages/common/api/portal/index.js
#	packages/common/components/Article/index.js
#	packages/common/components/Article/sub-components/article-apps.js
#	packages/common/components/Article/sub-components/article-header.js
#	packages/common/components/Article/sub-components/article-hide-menu-button.js
#	packages/common/components/Article/sub-components/article-profile.js
#	packages/common/store/AuthStore.js
#	packages/common/store/SettingsStore.js
#	packages/common/utils/axiosClient.js
#	packages/common/utils/whiteLabelHelper.js
#	packages/components/context-menu/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
#	public/locales/en/Common.json
#	public/scripts/config.json
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	yarn.lock
2023-10-04 15:36:31 +04:00
e3ad782228 Update build.frontend.bat 2023-10-04 12:19:23 +04:00
fc503d8528 merge from develop 2023-10-04 00:26:33 +03:00
7a62724a82 *.log to gitignore 2023-10-03 19:59:05 +03:00
5085618cc3 SSR: fix path 2023-10-03 19:58:23 +03:00
b099c11535 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-buildtools into develop 2023-10-03 19:40:21 +04:00
49faa6de95 Fix build docker dev (disabled ASC.TelegramReports) 2023-10-03 19:39:24 +04:00
db6a7eec48
Merge pull request #3 from ONLYOFFICE/master
Merge master into develop
2023-10-03 18:33:28 +03:00
e2d1e2378f Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-buildtools into develop 2023-10-03 19:16:06 +04:00