DocSpace-buildtools

IlyaSobolev/DocSpace-buildtools

Fork 0

...

Author	SHA1	Message	Date
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
pavelbannov	ec4c6b38a7	ClearEvents moved to ASC.Web.Studio	2023-03-21 18:49:33 +03:00

Author

SHA1

Message

Date

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

pavelbannov

ec4c6b38a7

ClearEvents moved to ASC.Web.Studio

2023-03-21 18:49:33 +03:00

Compare commits

2 Commits

master ... feature/me

Diff Content Not Available

Compare commits

2 Commits master ... feature/me

Diff Content Not Available

2 Commits

master ... feature/me