4aa80e2fb5
build: docker: dev: fix variable
2023-09-06 19:09:35 +04:00
bc57cd84d0
build: docker: dev: added dnsmasq for local domain routing
2023-09-06 18:24:58 +04:00
d864448da5
Merge branch 'hotfix/v1.1.2' into develop
...
# Conflicts:
# products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/PortalController.cs
2023-09-04 23:01:50 +03:00
392a908c57
fix Bug 63573 - Add the ability to automatically switch to SSL ( #1662 )
2023-09-04 12:03:36 +03:00
7d141a2aa4
Temporarily fix nodejs installation for Centos 8 Stream
2023-09-04 12:55:53 +05:00
e5739f1109
Fix the problem with different redis config locations
2023-09-02 15:46:09 +05:00
2c5fde7a06
Change the systemd service's existence condition
2023-09-01 20:07:45 +05:00
ccd36b5ccd
Fix the problem with different redis config locations
2023-09-01 20:05:22 +05:00
4f716c37c1
Fix password generation in MySQL to match the current security policy
2023-09-01 17:34:34 +05:00
3e6a417d19
Merge branch 'hotfix/v1.1.2' into develop
...
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
2023-09-01 15:33:39 +03:00
dee941b640
fix Bug 63936 - Fix the document server configuration issue with openresty installed
2023-09-01 16:58:20 +05:00
ddbec6b8a9
Roll back unnecessary cosmetic changes
2023-09-01 15:52:20 +05:00
efde095892
Merge branch 'hotfix/v1.1.2' into feature/external-IP-services
2023-09-01 14:33:57 +04:00
Elbakyan Shirak
72e803eabb
Fix some bugs
2023-09-01 14:28:44 +04:00
de693d8945
Fix the problem with substitution of special characters contained in the connection string
2023-09-01 15:28:22 +05:00
eda6b4d63f
Updating the nodejs repository installation to an up-to-date version
2023-09-01 14:27:41 +05:00
Elbakyan Shirak
96a5dafea5
Add external services connection, resolve conflict
2023-09-01 11:08:43 +04:00
14290e31c4
Fix the problem Invalid URI: The hostname could not be parsed.
2023-08-30 18:06:10 +05:00
92db0abdf2
Fix map for service_client
2023-08-29 16:38:13 +03:00
f9635e0e42
Add dependency installation at domain check in OCI docker
2023-08-29 16:25:03 +05:00
3249e4a99f
Fix problem when pulling images in OCI docker
2023-08-29 16:24:36 +05:00
11714a30b1
Merge pull request #1673 from lemmav/hotfix/upstream.conf.template
...
Update map config
2023-08-29 12:33:08 +03:00
063673ac60
Fix redis value substitution error
2023-08-29 14:20:16 +05:00
b20a26f92a
Update map config
2023-08-29 11:26:01 +03:00
f0e985703c
Correct the substitution of the Redis host and port
2023-08-29 12:27:12 +05:00
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
00ff80d6ee
Fix docker network creation and database connection problem
2023-08-28 17:44:18 +05:00
Nasrullo Nurullaev
1db37e457a
Add scripts for OpenResty configurations ( #1666 )
...
* Add scripts for configuring OpenResty
* Small fixes
2023-08-28 15:29:49 +03:00
265a1ae6ca
Fix errors when starting services via docker.profiles.yml
2023-08-28 14:43:59 +05:00
0865309ae8
Replace the nginx installation with an openresty installation ( #1663 )
2023-08-25 15:58:40 +03:00
67287d712c
Add the ability to use an external services in OCI docker ( #1598 )
...
* Add the ability to use an external service elasticsearch
* Add the ability to use an external redis service
* Add the ability to use an external rabbitmq service
* Add the ability to use external mysql service
* Add network creation in OCI
* Implement non-use of host variable when connecting locally to containers
* Add missing environments in .yml files
* Add the ability to use external Docs service
* Fix problem of a given host as a container name
* Add the ability to configure the elasticsearch protocol
* Add comments to the .env file
* Fix migration-runner to mysql container connection error
* Implement Docs configuration via external URL
* Fix elasticsearch configuration parameter substitution
2023-08-25 15:39:26 +03:00
87605003af
Remove overwriting of parameter values during reconfiguration ( #1590 )
2023-08-25 15:18:02 +03:00
Nasrullo Nurullaev
567fdbb60b
fix Bug 63367 - Add End User License Agreement ( #1651 )
...
* fix Bug 63367 - Add End User License Agreement
* Add Enterprise EULA
* Remove AI tag form LicenseDlg
2023-08-25 15:15:56 +03:00
Nasrullo Nurullaev
6b2d8a6b09
Add OpenResty to DocSpace as prerequisite ( #1659 )
...
* Add OpenResty to DocSpace as prerequisite
* Add OpenResty license
* Small fixes
2023-08-24 17:51:01 +03:00
Nasrullo Nurullaev
9de902006a
fix Bug 63675 - Fix issue with App name after upgrading ( #1654 )
...
* fix Bug 63675 - Fix issue with App name after upgrading
* Change way of getting property
2023-08-24 14:03:03 +03:00
78d405ae79
fix Bug 63666 - Add priority use of OCI scripts with S3
2023-08-23 16:51:57 +05:00
Nasrullo Nurullaev
195a1c7386
fix Bug 63642 - Fix issue with installing MySql ( #1649 )
2023-08-22 10:46:14 +03:00
Nasrullo Nurullaev
4dcd8099d6
Reduce the install time in DocSpace msi build ( #1611 )
2023-08-21 16:07:13 +03:00
Nasrullo Nurullaev
d5cb33579d
fix Bug 63689 - Fix issue with adding administrators ( #1647 )
2023-08-21 16:05:07 +03:00
bc1f6c703e
Specify the default docker installation type as community
2023-08-21 14:24:31 +05:00
06f9815a4f
Modify build proxy-router from nginx to openresty ( #1642 )
...
* Add feature for nginx configure redis
* Fix docker nginx image build
* Fix permition
* Fix feature for replasing redis host config
* Fix sed action
2023-08-19 12:57:51 +03:00
3ec372d034
Merge branch 'hotfix/v1.1.2' into feature/csp
2023-08-11 15:12:36 +04:00
e531654c54
Merge branch 'hotfix/v1.1.2' into develop
...
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
# common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
# common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
# config/nginx/onlyoffice.conf
# packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/common/api/files/index.js
# packages/components/.storybook/preview.js
# packages/components/package.json
# packages/editor/src/server/lib/helpers/index.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
2023-08-11 12:47:44 +03:00
b58d8b5edc
Fix problem with LOG_LEVEL substitution in K8s
2023-08-11 13:09:37 +05:00
321a3ebbb7
Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.2
2023-08-11 10:54:35 +03:00
3781a67657
Fix healthchek url for login and doceditor
2023-08-11 10:52:43 +03:00
6aa0c55e50
Fix problem when substituting OAUTH_REDIRECT_URL
2023-08-11 12:09:07 +05:00
cb9f62321a
Fix problem when substituting OAUTH_REDIRECT_URL
2023-08-11 12:03:18 +05:00
2c9db2ac0d
Docker: Dev: Added redis_host setup
2023-08-09 19:55:17 +04:00
13708e324a
Docker.app: Changed nginx to openresty
2023-08-09 19:54:32 +04:00
