IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ONLYOFFICE DocSpace is a room-based collaborative platform which allows organizing a clear file structure depending on users' needs or project goals. Flexible access permissions and user roles allow fine-tuning the access to the whole space or separate rooms.
38,680 Commits 38 Branches 22 Tags 359 MiB
Rich Text Format 52.9%
Shell 22.7%
Python 7.7%
Batchfile 3.6%
VBScript 3.4%
Other 9.6%
feature/merge-services
Go to file
Alexey Safronov bca45f5cb9 Merge branch 'develop' into feature/letsencrypt 
# Conflicts:
#	build.static.bat
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	build/install/docker/config/nginx/templates/upstream.conf.template
#	common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
#	common/ASC.Core.Common/HostedSolution.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/Models/SettingsModel.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	config/apisystem.json
#	config/nginx/onlyoffice.conf
#	frontend.code-workspace
#	frontend.macos.code-workspace
#	install/docker/Dockerfile.runtime
#	package.json
#	packages/client/package.json
#	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/PortalSettings/categories/common/Branding/whitelabel.js
#	packages/client/src/pages/PortalSettings/categories/common/appearance.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/integration/SingleSignOn/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/client/webpack.config.js
#	packages/common/api/index.js
#	packages/common/components/Article/index.js
#	packages/common/components/Article/sub-components/article-header.js
#	packages/common/components/Article/sub-components/article-hide-menu-button.js
#	packages/common/utils/axiosClient.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
#	public/locales/en/Common.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 18:06:05 +04:00
config Fix bad merge 2023-10-03 19:13:51 +04:00
install Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-buildtools into develop 2023-10-03 19:40:21 +04:00
run merge from develop 2023-10-04 00:26:33 +03:00
scripts merge from develop 2023-10-04 00:26:33 +03:00
start merge from develop 2023-10-03 17:38:22 +03:00
tools drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
.gitignore *.log to gitignore 2023-10-03 19:59:05 +03:00
build.backend.bat fixed build.backend.bat 2023-10-02 15:30:39 +03:00
build.backend.docker.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
build.backend.docker.ps1 merge from develop 2023-10-03 17:38:22 +03:00
build.backend.docker.sh Fix bad merge 2023-10-03 19:13:51 +04:00
build.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
build.document.server.docker.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
build.document.server.docker.ps1 Fixed scripts on windows 2023-10-02 17:14:17 +03:00
build.frontend.bat Update build.frontend.bat 2023-10-04 12:19:23 +04:00
build.sh Updated paths and permissions 2023-10-02 16:52:30 +04:00
build.static.bat fixed build path 2023-10-03 13:25:25 +03:00
buildAndDeploy.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
clear.backend.docker.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
clear.backend.docker.ps1 Fixed scripts on windows 2023-10-02 17:14:17 +03:00
clear.backend.docker.sh replace build => buildtools 2023-10-02 18:09:10 +03:00
createMigrations.bat fixed migration and test 2023-10-03 18:14:05 +03:00
Jenkinsfile drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
publish.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
run.backend.translations.tests.bat fixed migration and test 2023-10-03 18:14:05 +03:00
run.backend.translations.tests.sh merge from develop 2023-10-03 17:38:22 +03:00
run.e2e.test.bat replace build => buildtools 2023-10-02 18:09:10 +03:00
run.e2e.translations.tests.bat replace build => buildtools 2023-10-02 18:09:10 +03:00
run.e2e.translations.tests.personal.bat replace build => buildtools 2023-10-02 18:09:10 +03:00
run.translations.spellcheck.test.bat Update path 2023-10-03 12:57:14 +04:00
run.translations.spellcheck.test.sh Update path 2023-10-03 12:57:14 +04:00
run.translations.tests.bat Fix running client's translations tests 2023-10-03 12:43:20 +04:00
run.translations.tests.sh Fix running client's translations tests 2023-10-03 12:43:20 +04:00
runasadmin.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
runMigrations.bat fixed migration and test 2023-10-03 18:14:05 +03:00
runMigrations.sh Updated paths and permissions 2023-10-02 16:52:30 +04:00
runMigrations.standalone.bat fixed migration and test 2023-10-03 18:14:05 +03:00