868492b562
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Billing/BillingClient.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Notify/Context.cs
# common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
# common/ASC.FederatedLogin/Helpers/RequestHelper.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/EasyBibHelper.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
2022-03-19 22:16:03 +03:00
69a6ed4d46
Bugfix/packages correction ( #583 )
...
* Add templates
* Add a launch of the configuration script to the postinst
* Edit OneClickInstall for new changes
* Correct appserver-configuration.sh
* chown fix
* Correction debconf-set-selections
* Fix the launch of services after installation
* test
* Correction for database values
* Add variables for mysql configuration
* Revert "test"
This reverts commit 85e5050eb2cfeb1b3723076e44ec0819e0889142.
* Add launch of zookeeper and kafka services
2022-03-14 11:26:24 +03:00
0f3ce16f85
create new winsw.exe
...
fix logs
2022-03-09 14:34:28 +03:00
2c526259d3
winsw: update
...
fix names
add start mode
remove log settings (don't work. always create log how like "append" mode)
add stop before uninstall
2022-03-04 12:14:46 +03:00
7f70d0be04
Merge branch 'feature/backend-refactor' into feature/winsw
2022-02-24 14:50:18 +03:00
ac0e314f60
winsw: refactoring
...
update bats
relocate xml and exe
2022-02-22 15:45:21 +03:00
3aeac42444
Merge branch 'master' into develop
...
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
5c7e46b9ab
winsw: add winsw
...
add urlShortener.xml
update bats
add winsw.exe
2022-02-21 20:46:23 +03:00
Sergey Kirichenko
6e20d619d1
Mod socket proxy conf
2022-02-14 18:41:15 +03:00
5c9336d50b
Bugfix/update OneClickInstall ( #505 )
...
* Add document server image configuration
* Modify docker document server run config (#476 )
* Changing the files installation
* Add an update to Docker-1click
* Minor changes
* Fix mysql installation
* Change the kafka installation
* Update kafka version
* Download sql scripts
2022-02-10 10:37:09 +03:00
f4d6cdde59
Bugfix/change a spec file ( #514 )
...
* Add a necessary sources
* Visual code changes
* Update appserver.spec
2022-02-09 10:25:10 +03:00
Sergey Kirichenko
340fac7626
Add install to image sudo
2022-02-08 12:00:23 +03:00
Sergey Kirichenko
493a189bf3
Add install to image curl, vim
2022-02-08 11:23:50 +03:00
Sergey Kirichenko
6307f558ad
Add node install to images
2022-02-08 10:04:53 +03:00
bedfad1ec5
Merge branch 'master' into develop
...
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
eca872cdd8
Add hardware check in deb and rpm OneClickInstall ( #479 )
...
* Add hardware check in deb and rpm OneClickInstall
* Modify docker document server run config (#476 )
* Revert "Modify docker document server run config (#476 )"
This reverts commit 9ed7f71e71ad431386717d37968b97ec2117add8.
2021-12-10 16:26:34 +03:00
805718a71b
Update kafka version in OneClickInstall
2021-12-10 14:30:01 +03:00
Sergey Kirichenko
8d1f9da11c
Modify docker document server run config ( #476 )
...
* Fix config
* Modify docker ds config
* Modify docker document server run
2021-12-06 15:21:06 +03:00
d31ea87211
Merge branch 'master' into develop
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
Sergey Kirichenko
2d0bdb0646
Add an additional tag for docker images in push hook script ( #462 )
...
* Add tag for hook push sript
* Modify pash hook
* Modify pash hook
* Modify pash hook
* Modify pash hook
* Modify pash hook
2021-11-19 14:19:30 +03:00
738cacbf16
Change location of dotnet file
2021-11-11 15:37:59 +03:00
Sergey Kirichenko
8e9725d820
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1
2021-11-02 14:39:29 +03:00
Sergey Kirichenko
f3746a43ab
Modify parameters
2021-11-02 14:38:11 +03:00
Sergey Kirichenko
84b76d9f25
Add disable_elastic=true to ASC.Files.Service run config ( #446 )
2021-11-01 19:39:20 +03:00
0215599566
merge from develop
2021-10-27 19:37:12 +03:00
957aa8bd81
fixed started services
2021-10-26 20:09:19 +03:00
3ce15a9329
refactoring build scripts
2021-10-26 16:14:34 +03:00
403388fbf1
Added solution filter
...
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
73403bcbff
Bugfix/modify docker oneclick ( #385 )
...
* Modify docker oneclick
* Add a variable with a branch selection
* Minor correction
2021-10-11 12:08:29 +03:00
Sergey Kirichenko
5d1bfbefa4
Modify docker images build ( #380 )
...
* Modify images build config
* Cosmetic modify
* Modify git clone ind Dockerfile
2021-10-06 16:43:18 +03:00
Sergey Kirichenko
39357575fe
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
2021-10-05 18:41:35 +03:00
Sergey Kirichenko
8f89247357
Fix script
2021-10-05 18:40:49 +03:00
Sergey Kirichenko
74902888b7
Fix docker image build
2021-10-05 16:52:26 +03:00
Sergey Kirichenko
0a8f6c9e48
Modify arguments for build scripts in Dockerfile-app
2021-10-05 11:34:44 +03:00
Sergey Kirichenko
68f58468cc
Add debug infor to build srcipt
2021-10-05 11:28:06 +03:00
43a8959f74
Minor bug fixes ( #361 )
2021-09-30 17:41:11 +03:00
Sergey Kirichenko
dbc174e955
Add support to deb package ( #266 )
2021-09-30 15:05:43 +03:00
315665e87a
BuildAndDeploy
2021-09-23 20:58:39 +03:00
4a0c6a94c6
replace nssm with sc
2021-09-22 19:51:37 +03:00
Sergey Kirichenko
9221136e50
Modify frontend build feature ( #341 )
...
* Modify frontend build
* Modify frontend build
* Modify build hooks
2021-09-21 10:53:05 +03:00
Sergey Kirichenko
f624b20fb4
Add service ASC.SsoAuth ( #313 )
...
* Add build service ASC.SsoAuth
* Fix build Dockerfile-app and build-frontend.sh
* Fix build path for ASC.SsoAuth.Svc
2021-08-03 12:29:21 +03:00
84ea95559f
Bugfix/Change the systemd startup type ( #302 )
...
* Change the systemd startup type
* Delete the unused systemd parameter
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-07-29 16:23:45 +03:00
Sergey Kirichenko
c85a1185ec
Modify build backend scripts ( #310 )
2021-07-27 12:03:19 +03:00
Sergey Kirichenko
7a06b0c2e9
Modify docker build config files for sw.js ( #308 )
2021-07-22 19:27:30 +03:00
653066af0c
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
Sergey Kirichenko
eacf6e663c
Add modification of number in appsettings ( #304 )
...
* Modify number in appsettigs
* Cosmetic changes
* Cosmetic changes
* Modify arg in Docker-app
* Add build args in hooks build
* Add arg varibles to hooks build
2021-07-16 20:14:37 +03:00
8d287249af
Bugfix/rpm errors ( #295 )
...
* Fix the elasticsearch configuration
* Add copying of the start files
* License correction
* Fix file copying
* Add a warning about an unsupported version of the distribution
* Correction of folder names
* Correction of directory name
* Fix configuration errors and add a quiet mode
* Remove a quiet mode
* Release ports for launching services
* Add topics to launch socket.io
* Fix folder name
* Fix the output of messages about the creation of topics
* Remove unnecessary lines
* Delete an unnecessary line
2021-07-13 18:03:48 +03:00
Sergey Kirichenko
7af9bb08c9
Fix elasticsearch configure ( #285 )
2021-06-18 14:30:11 +03:00
Sergey Kirichenko
a91ea81e89
Modify elasticsearch configuration ( #281 )
...
* Modify elasticsearch config
* Modify version ELK
* Cosmetic modify
2021-06-17 12:49:39 +03:00
Sergey Kirichenko
7dc8889e2f
Fix building image ASC.Socket.IO.Svc ( #276 )
2021-06-10 18:18:07 +03:00
