|
|
66ffc1b759
|
Fix error unknown directive more_clear_headers
|
2024-02-14 17:47:17 +07:00 |
|
|
|
fecc786bae
|
Merge branch 'hotfix/v2.0.2' into develop
|
2024-02-06 20:27:39 +07:00 |
|
|
|
af2a5e97ba
|
Fix error unknown directive more_clear_headers
|
2024-01-26 14:34:35 +07:00 |
|
|
|
4be6dbbfdd
|
Update node version for docker
|
2024-01-25 13:14:58 +03:00 |
|
|
|
bbebde3c38
|
Docker: update node version to last LTS v20.11.0
|
2024-01-23 13:49:10 +04:00 |
|
|
|
6c2211e231
|
Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
# install/OneClickInstall/install-Debian.sh
# install/deb/debian/rules
|
2023-12-13 20:00:06 +04:00 |
|
|
|
db95e0e504
|
fix Bug 65457 - Implement the ability to roll back ssl certificate (#100)
* Optimize the ssl configuration script and add additional error handling
* fix Bug 65457 - Implement the ability to roll back ssl certificate
|
2023-12-11 17:01:32 +03:00 |
|
|
|
2c5af9dfa4
|
Merge pull request #75 from ONLYOFFICE/feature/management
Feature/management
|
2023-12-07 18:20:50 +04:00 |
|
|
|
4266c2e889
|
Add flag to ignore the warning in pip install (#96)
* Add ignore the warning for pip
* Fix double flag
|
2023-12-05 15:57:27 +03:00 |
|
|
|
0ec94ce27a
|
Implement OWASP recomendations (#79)
|
2023-11-29 13:30:42 +03:00 |
|
|
|
50a5256159
|
Merge branch 'develop' into feature/management
|
2023-11-29 12:43:30 +04:00 |
|
|
|
bddc7d5154
|
Modify dotnet docker image version (#77)
|
2023-11-29 10:38:43 +03:00 |
|
|
|
24311026fe
|
Merge branch 'develop' into feature/management
|
2023-11-28 17:10:12 +04:00 |
|
|
|
535a4c1555
|
Merge pull request #71 from ONLYOFFICE/feature/net-8
Feature/net 8
|
2023-11-27 08:01:58 -08:00 |
|
|
|
a262adcc4e
|
Fix management routing
|
2023-11-21 14:22:45 +04:00 |
|
|
|
b064d127fe
|
Merge branch 'develop' into feature/management
|
2023-11-21 12:37:38 +04:00 |
|
|
|
bef986010d
|
Fixed dev docker
|
2023-11-21 10:50:04 +03:00 |
|
|
|
31ae699a00
|
Correct domain acquisition errors and integrate the specified domain. (#62)
|
2023-11-14 17:15:15 +03:00 |
|
|
|
96d9c65e05
|
Create a script to output logs from containers (#44)
|
2023-11-10 17:12:32 +03:00 |
|
|
|
79a4e818d2
|
Merge branch 'develop' into feature/management
# Conflicts:
# build.backend.docker.ps1
# build.backend.docker.sh
# clear.backend.docker.ps1
# clear.backend.docker.sh
# start/start.backend.docker.ps1
# start/start.backend.docker.sh
|
2023-11-09 19:00:55 +05:00 |
|
|
|
50442a67ae
|
Modify build yarn version (#42)
* Fix yarn build
* Add for Web.Studio eventsBus
|
2023-11-07 17:26:26 +03:00 |
|
|
|
b5242f5b53
|
Add debuginfo into docker image
|
2023-10-31 15:08:54 +03:00 |
|
Nasrullo Nurullaev
|
cca908fe0f
|
fix Bug 64516 - Fix issue with healthcheck logs (#29)
|
2023-10-27 12:31:22 +03: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 |
|
|
|
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 |
|
|
|
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
|
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 |
|
|
|
db6a7eec48
|
Merge pull request #3 from ONLYOFFICE/master
Merge master into develop
|
2023-10-03 18:33:28 +03:00 |
|
|
|
bc9f96ee7d
|
Fix bad merge
|
2023-10-03 19:13:51 +04:00 |
|
|
|
78a222ebd1
|
merge from develop
|
2023-10-03 17:38:22 +03:00 |
|
|
|
cef367ef23
|
Fix path for build
|
2023-10-03 17:05:32 +03:00 |
|
|
|
67fd083eec
|
Modify path for docker build
|
2023-10-03 16:28:10 +03:00 |
|
|
|
247bcd6fd2
|
path modify
|
2023-10-03 11:23:55 +03:00 |
|
|
|
88c8ca3bf8
|
path modify
|
2023-10-03 11:19:49 +03:00 |
|
|
|
e1d0bb5f1d
|
Applied chmod +x for *.sh scripts
Issue: OCI runtime create failed: permission denied: unknown
|
2023-10-03 11:29:50 +04:00 |
|
|
|
1584336d5f
|
replace build => buildtools
|
2023-10-02 18:09:10 +03:00 |
|
|
|
c0ccfb0a6a
|
Fixed scripts on windows
|
2023-10-02 17:14:17 +03:00 |
|
|
|
dedb8cf3b3
|
Updated paths and permissions
|
2023-10-02 16:52:30 +04:00 |
|
|
|
25241c61d4
|
drop all files for backend/frontend
|
2023-10-02 13:23:37 +03:00 |
|
