34fc3e545d
rename winsw services and delete socket.io.bat
2022-03-01 15:46:31 +03:00
88c7f5ba72
Merge branch 'feature/backend-refactor' into feature/winsw
2022-02-25 11:18:26 +03:00
b5b8b1edf0
added support scheduler backup request handling
2022-02-24 19:53:49 +03:00
63d163cba6
winsw: socket.io
2022-02-24 16:50:02 +03:00
7f70d0be04
Merge branch 'feature/backend-refactor' into feature/winsw
2022-02-24 14:50:18 +03:00
707739813c
winsw: SsoAuth
2022-02-24 14:46:55 +03:00
d4e48004bc
added socketio
2022-02-24 13:47:18 +03:00
d157dd637e
Build: Removed old products nginx configs
2022-02-22 18:23:56 +03:00
ac0e314f60
winsw: refactoring
...
update bats
relocate xml and exe
2022-02-22 15:45:21 +03:00
b8b23d266d
winsw: update bats
2022-02-22 13:15:02 +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
6b883bcd60
Merge branch 'develop' into feature/support-elasticache
2022-01-13 18:16:43 +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
04ff8d38dc
refactoring build scripts
2021-12-24 16:47:37 +03:00
5e088d3ba8
Jenkins: fix build
2021-12-23 21:54:42 +03:00
4688fcce41
Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0
2021-12-22 18:48:41 +08:00
b9d7141862
Web: rename e2e.test.bat to run.e2e.test.bat and translation.test.bat to run.e2e.translations.tests.bat
2021-12-22 16:42:37 +08:00
4274e3a581
Web: Tests:
...
+ Added new SpellCheckTest() and submodule (common/Tests/Frontend.Translations.Tests/dictionaries)
+ Split tests on categories FastRunning|LongRunning
+ Added new build/run.translations.spellcheck.test.bat
2021-12-21 16:59:04 +03:00
ff7b6fc432
Web: init e2e tests
2021-12-21 15:59:11 +08:00
6d84bd5f04
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
2021-12-15 17:22:17 +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
751284e861
Added run.translations.tests.bat
2021-12-03 12:16:28 +03:00
d94ea502df
Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop
2021-11-21 16:47:25 +03:00
643c1ce6f1
fixed build.bat
2021-11-21 16:46:09 +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
fb197315f9
fix buildAndDeploy.bat
2021-11-19 18:21:21 +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
62403e127a
refactoring build script
2021-11-16 16:14:21 +03:00
f0cfeb1b42
refactoring build script
2021-11-16 16:13:13 +03:00
d235288370
refactoring build script
2021-11-15 19:36:09 +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
b15bc7b5cf
WebHook: fix service
2021-10-29 13:23:37 +03:00
26511d9fb7
Merge branch 'develop' into feature/webhooks
...
# Conflicts:
# ASC.Tests.sln
2021-10-29 13:18:57 +03:00
0215599566
merge from develop
2021-10-27 19:37:12 +03:00
90f42aecba
fixed startup WebHealthChecksUI Service
2021-10-27 18:52:13 +03:00
7ac75bd206
fixed buildAndDeploy script
2021-10-27 13:49:19 +03:00
957aa8bd81
fixed started services
2021-10-26 20:09:19 +03:00
32240717ff
refactoring build scripts
2021-10-26 16:39:00 +03:00
3ce15a9329
refactoring build scripts
2021-10-26 16:14:34 +03:00
b1134d239c
Merge branch 'develop' into feature/auto-migrations
...
# Conflicts:
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
2021-10-25 20:52:13 +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
4c364ea938
services: fix
2021-10-21 19:54:08 +03:00
e228930a5b
BuildAndDeploy fix
2021-10-21 19:12:31 +03:00
426754039b
Build: nodejs services
2021-10-21 18:30:09 +03:00
5a5e299d98
Merge branch 'develop' into feature/webhooks
...
# Conflicts:
# ASC.Web.sln
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
2021-10-19 18:30:59 +03:00
3f800cb9b0
Jenkins: fix
2021-10-17 20:35:58 +03:00
158f61087e
Jenkins: verbose
2021-10-17 19:34:56 +03:00
3022906b97
Jenkins: fix yarn
2021-10-16 00:00:10 +03:00
bf80429f52
Jenkins: fix yarn path
2021-10-15 23:58:01 +03:00
dbe5f25427
Jenkins: fix path
2021-10-15 23:56:48 +03:00
237e94a960
Jenkins: yarn path
2021-10-15 23:53:48 +03:00
c9c93fe613
Jenkins: yanr force install
2021-10-15 23:36:18 +03:00
126ea035fb
Jenkins: fix
2021-10-15 19:21:49 +03:00
8a782a9993
update run command
2021-10-12 14:17:16 +03:00
dd6f4f85a7
rename .bat
2021-10-11 17:20:46 +03:00
7402071c13
rename .bat
2021-10-11 17:20: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
232fa4ab7d
add migration generation
2021-10-07 12:50:33 +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
5e86f7a148
Build: Added support of Personal mode for web static files
2021-09-14 10:05:53 +03:00
d06b67a420
Jenkins: release build
2021-09-05 21:09:43 +03:00
Vashchuk Nikita
21a3dcefe6
small fix
2021-08-27 12:48:20 +03:00
Vashchuk Nikita
d66600b6c7
fix
2021-08-27 10:50:52 +03:00
d5646eaa92
Revert "Build: deploy public files"
...
This reverts commit 82e64781fe
.
2021-08-18 17:03:16 +03:00
82e64781fe
Build: deploy public files
2021-08-18 16:52:23 +03:00
bba83d2e9f
build.static.bat: Removed pause (for buildAndDeploy.bat)
2021-08-17 11:19:56 +03:00
07ea37bdfc
build.bat: Added comment
2021-08-17 11:12:30 +03:00
5c492ee583
Build: Optimization of build process
2021-08-17 11:00:36 +03:00
9873ea6fa0
Nginx: config for developers
2021-08-16 19:26:16 +03:00
f3ec5bb0e0
Nginx: static config
2021-08-16 15:18:45 +03:00
508bb59f0f
Build: Added yarn install to build.static.bat
2021-08-12 16:24:09 +03:00
fc99e05504
Build: Added build.static.bat
2021-08-12 16:19:16 +03:00
2157e33c7f
build: Added start/stop backend services only
2021-08-11 22:04:54 +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
cf7d002bc1
Merge branch 'develop' into feature/calendar
2021-07-28 12:16:39 +03:00
f1668a3b43
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
2021-07-27 12:43:01 +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
0e6078f9e2
Merge branch 'develop' into feature/ClearEvents
...
# Conflicts:
# ASC.Web.sln
2021-06-23 17:15:56 +03:00
20d1f9a738
merge from develop
2021-06-23 16:10:46 +03:00
85574630cb
Merge branch 'develop' into feature/ClearEvents
2021-06-23 15:30:55 +03:00
68ec473a6c
fix
2021-06-22 21:44:03 +03:00
d8abde6d88
SSoAuth: fix buid and run
2021-06-22 19:44:09 +03:00
Sergey Kirichenko
7af9bb08c9
Fix elasticsearch configure ( #285 )
2021-06-18 14:30:11 +03:00
00cc15fbf5
Merge branch 'develop' into feature/ClearEvents
2021-06-18 12:21:54 +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
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
...
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd
added health checks
2021-06-16 16:54:36 +03:00
d2fa149247
Jenkins: fix
2021-06-15 17:32:25 +03:00
89264cc48d
crm: created common project for common services
2021-06-15 13:41:17 +03:00
Sergey Kirichenko
7dc8889e2f
Fix building image ASC.Socket.IO.Svc ( #276 )
2021-06-10 18:18:07 +03:00
Sergey Kirichenko
82b3109fbc
Fix building ASC.Files image ( #275 )
2021-06-10 15:42:04 +03:00
a9cb51056b
Add support docker installation ( #271 )
...
* Fix removing old packages in rpm
* Add script downloads from github
* Add oneclickinstall by using docker
* Add a common script to select the installation
* Correction file name
* Add a reconfigure
* Edit download files
* Add a parameter for silent download
* Change the external port configuration
* Add the dotnet_env variable
* Add password generation
* Add invalid character filtering
* Change the copyright
* Change the copyright
* Add the local scripts parameter
* Minor fixes
* Copyright correction
2021-06-09 18:48:42 +03:00
SuhorukovAnton
860b682594
replace "DeleteOldEvents" in new service
2021-06-04 14:10:37 +03:00
15fb1c9a68
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
2021-05-31 19:01:54 +03:00
2dd7044097
Jenkins: fix notify
2021-05-31 19:01:40 +03:00
8d88dbae2c
Jenkins: fix test
2021-05-31 14:25:14 +03:00
570ede7bba
Merge branch 'develop' into feature/11.5.2
...
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
0be4e07865
SsoAuth: 2e37dcd0
2021-05-31 11:35:42 +03:00
4e5bd47c26
Feature/rpm update ( #229 )
...
* Add a build and install new services
* Change the packaging for the new build script
* Correct the configuration
* Add a bug fix with a mysql password containing ';'
* Fix services crash error
* Fix incorrect value addition in mysql
* Fix a rabbitmq error on CentOS 8
* Fix creating an invalid mysql password
* Fix non-existent tables Tenants
* Add an update to 1click
* Code correction
* Add two new services
* Add the buildpath variable
* Code Optimization
* Renaming services and creating a variable for the app name
* Revert "Merge branch 'feature/rpm-update' of https://github.com/ONLYOFFICE/AppServer into feature/rpm-update"
This reverts commit 19c1eae6f6e3f22f4cbc0e3276fa892b0d9fa97a, reversing
changes made to fb36a996366291486e3b9f5a6f46398916ef8a6c.
* Code Optimization
* Code optimization
* Code optimization and creating a variables
2021-05-20 17:39:38 +03:00
Vashchuk Nikita
82abf11109
Merge branch 'develop' into feature/calendar
...
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
# products/ASC.Calendar/Server/ASC.Calendar.csproj
# products/ASC.Calendar/Server/Controllers/CalendarController.cs
# products/ASC.Calendar/Server/Program.cs
# products/ASC.Calendar/Server/Properties/launchSettings.json
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
# products/ASC.Calendar/Server/Startup.cs
2021-05-18 13:24:02 +03:00
Vyacheslav Semin
3c2cc92001
Make the necessary edits to install in k8s ( #255 )
...
* Make the necessary edits to install in k8s
* Add image build for waiting for appserver to start
* Edit the env file
2021-05-18 12:36:21 +03:00
Vashchuk Nikita
bf41c21c4e
Add Radicale
2021-05-11 18:05:46 +03:00
8c446a574e
Jenkins: fix stages
2021-05-05 18:30:06 +03:00
SuhorukovAnton
3435b49b72
replace_nuget: delete configfile
2021-05-05 14:48:34 +03:00
Sergey Kirichenko
1e05b2a216
Del files in base image ( #239 )
...
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-29 15:27:50 +03:00
Sergey Kirichenko
baafc5f175
Add calendar and mail service in docker ( #234 )
...
* Add 2 services building feature
* Add 2 services for runnig
* Del in .env status latest
* Add to notify.yml 2 volumes
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-26 19:08:48 +03:00
1516fe0249
Merge branch 'develop' into feature/products
2021-04-21 21:49:39 +03:00
6a4fed2d2c
Init Calendar Server back-end
2021-04-21 21:47:27 +03:00
d57433c9dc
Added MailServer.bat
2021-04-21 21:46:59 +03:00
Sergey Kirichenko
69fb52026f
Add feature to run single notify service ( #223 )
...
* Modify building docker images
* Add argument to build script
* Modify build images
* Add feature build from oficial dotnet image
* Add feature build from oficial dotnet image
* Rename notify yml file
* Fix conflict
* Fix conflict
* Fix conflict
* Del RID aprument in build scripts
* Cosmetic modify
2021-04-14 15:45:16 +03:00
6fbb566c4e
Web: Init Mail/Calendar Comming Soon pages
2021-04-12 13:41:16 +03:00
4d644aff17
Merge branch 'master' into develop
2021-04-12 10:34:56 +03:00
be66f17d92
Fix version mismach
2021-04-09 16:29:45 +03:00
e86580e137
build: Removed useless old bat-files
2021-04-07 21:35:43 +03:00
Sergey Kirichenko
3ba4cf8807
Add build app on docker without copy dll ( #213 )
...
* Modify files for running new services
* Modify Dockerfile-app
* Modify
* Fix Dockerfile-app
* Fix start servives studio-notify, urlshortener
* Fix, modify services with sdk 5
* Build app without copy dll
* Modify Dockerfile
* Cosmetic changes
* Add build srcipts to Dockerfile
* Delete test sh scripts
* Del status 4testing
* Fix docker hub build
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-07 12:15:27 +03:00
Sergey Kirichenko
ad3eed3552
Add scripts for building services ( #212 )
...
* Add build and publish srcipts for services
* Add script for buildint frontend
* Fix publish-backend.sh
* Modify publish script for building
* Cosmetic modify publish backend script
2021-04-06 14:28:12 +03:00
NikitaVashchuk
6256c906f6
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
...
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
2021-04-05 18:29:13 +03:00
8f2baed113
Jenkinsfile: fix
2021-03-31 18:24:32 +03:00
d46d48f2ab
fixed Jenkinsfile
2021-03-26 16:41:21 +03:00
00699a4304
fixed Jenkinsfile
2021-03-23 22:22:38 +03:00
5930c30150
Build: Front-end: commented wipe
2021-03-23 15:21:40 +03:00
a50701e6da
Build: Refactoring
2021-03-23 14:10:33 +03:00
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +03:00