Commit Graph

688 Commits

Author SHA1 Message Date
19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
161857e2aa Create README.md for OneClickInstall 2023-05-29 11:23:41 +05:00
cf4eb45294 Correct the installation type register 2023-05-25 13:57:12 +05:00
f5b46dc196 Preparing 1CI scripts for release 2023-05-25 13:30:03 +05:00
158ac6ecf1 Fix docs configuration in packages 2023-05-24 12:51:41 +05:00
Nasrullo Nurullaev
900c73e362
Add PostgreSQL dependency in community version (#1433) 2023-05-23 16:33:04 +05:00
Nasrullo Nurullaev
882cf0bc76
Add Document Server CE dependency in community version (#1422)
* Add Document Server in community version

* Fix issue with JWT value transmission in config
2023-05-17 12:15:02 +05:00
29b6d20314
Bugfix/Fix services updates and optimize value retrieval in Docker OCI (#1418)
* Fix found orphan containers for this project warning

* Fix getting the machinekey

* Fix mysql data retrieval and substitution

* Fix services updates and optimize value retrieval

* Correct the help
2023-05-16 18:54:58 +05:00
91c0367a6d Fix ffmpeg installation for centos 9 2023-05-12 14:50:21 +05:00
9aa4d495fb Optimize getting values from the connection string in OCI 2023-05-12 14:49:59 +05:00
7a6b739421 Add an installation type parameter to the OCI 2023-05-12 14:48:18 +05:00
9386b2ae09 Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests 2023-05-11 16:20:33 +03:00
Nasrullo Nurullaev
4522cf2910
Update PostgreSQL version to 12.9 (#1411) 2023-05-10 17:29:26 +05:00
18acde413b Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests 2023-05-10 13:57:30 +03:00
Nasrullo Nurullaev
771ea32b8a
Update MySQL version to 8.0.32 (#1410) 2023-05-10 12:01:03 +05:00
01f4b889a4
Merge pull request #1402 from ONLYOFFICE/bugfix/fix-client-proto
Bugfix/fix client proto
2023-05-04 18:04:13 +03:00
1836a8d8c7 docker: fixed forward params 2023-05-04 15:17:34 +03:00
e1c8226587 docker: forward knows_networks, known_proxies params 2023-05-04 14:15:19 +03:00
e3594e3c54 Merge branch 'hotfix/v1.0.1' into features/backend-resx-tests 2023-05-03 23:32:11 +03:00
d265fb4373 add Backend.Translations.Tests 2023-05-03 23:31:45 +03:00
f9b3e30409 docker: fixed 2023-05-03 11:53:44 +03:00
Nasrullo Nurullaev
247e5d3f1c
Add FFmpeg dependency in windows installer (#1397) 2023-05-03 12:57:29 +05:00
f1fba8a19a docker: added docker subnet to .net knownNetworks 2023-05-02 18:01:33 +03:00
9790a931f6 Code optimization in product-configuration 2023-05-02 17:40:45 +05:00
e60870df1c docker: fixed command 2023-04-28 18:57:33 +03:00
dc6301ee2f docker: added configuration parameter to docker publish 2023-04-28 18:51:57 +03:00
nasrullonurullaev
f9ca9c83e0
Fix build issue with invalid dotnet built-related command 2023-04-28 18:56:33 +05:00
cf033509b3 Fix machinkey substitution in packages 2023-04-28 15:18:28 +05:00
8faf8d8a5c Fix configuration of the deb package 2023-04-28 15:15:52 +05:00
057484eaaa Fix configuration permissions in packages 2023-04-28 15:15:22 +05:00
f42d0b7688 Fix nginx configuration in packages 2023-04-28 15:14:25 +05:00
9db2ecbb87 Fix package dependencies and add recommended dependencies 2023-04-28 15:13:33 +05:00
53704749bb
Merge pull request #1308 from ONLYOFFICE/feature/vscode-tasks
feature/vscode-tasks
2023-04-27 17:04:06 +04:00
nasrullonurullaev
1cf5423a07
Passed the eventBus arguments to services (#1392) 2023-04-27 11:41:10 +05:00
71a3ae2cd0 Minor cosmetic and functional fixes in packages 2023-04-26 12:00:11 +05:00
c8994dda20 Add help for various installations 2023-04-26 11:59:07 +05:00
870eb81376 Add JWT configuration to 1CI 2023-04-26 11:57:42 +05:00
sk81.biz@gmail.com
721676f662 Del dev config json files 2023-04-21 13:11:22 +03:00
6255cb65ee Optimize package configuration 2023-04-19 14:09:06 +05:00
7475d83fc8 Add ffmpeg dependency in packages 2023-04-19 14:06:26 +05:00
70d3f98633 Docker: Dev: Enabled SSO 2023-04-18 14:34:03 +04:00
3e2e60e7b0 Translation: Tests: Fix spell check test 2023-04-14 18:21:48 +04:00
Sergey Kirichenko
41496fb47d
Add codecs for file-services (#1353)
* Modify repo for ffvideo

* Add codecs for file-services
2023-04-13 23:12:17 +05:00
a52846fd91 Fix build Docker dev 2023-04-12 23:55:38 +04:00
Sergey Kirichenko
940fc91ca8
Add build ffvideo (#1343)
* Modify build version ffmpeg from 4 to 6

* Add software-properties-common for file-services

* Fix buiild

* Fix buiild

* Modify docker build ffmpeg6

* Testing build ffmpeg 6

* Add ffmpeg 6

* Add build ffvideo for file-services
2023-04-12 15:03:10 +05:00
bd5583187d Fix creation of environment configuration files in packages 2023-04-10 14:41:13 +05:00
Sergey Kirichenko
2238a82444
Add docker healthchek for dotnet containers (#1330) 2023-04-04 18:34:14 +05:00
56bda92e55 Build: Fixed obsolete parameter application 2023-03-24 09:59:48 +03:00
70f5314102 Build: Fixed commands for Dockerfile.dev 2023-03-24 09:58:31 +03:00
4ff6ac6bfe Build: Fixed .bat args 2023-03-24 09:57:31 +03:00