2f73ecb0cc
Merge branch 'feature/win-docker' of https://github.com/ONLYOFFICE/DocSpace into feature/win-docker
2022-11-23 19:24:02 +03:00
57b257b9af
Removed useless builds in docker dev for k8s
2022-11-23 19:23:56 +03:00
bd4ec8c77a
Fix docker dev mysql version
2022-11-23 19:22:55 +03:00
3ceb194d5d
Build: .env up MySQL version to 8.0.31
2022-11-23 19:07:08 +03:00
df450b1dd3
added slnf
2022-11-23 18:26:50 +03:00
531b469d90
Build: Fixed typo
2022-11-23 16:24:35 +03:00
4d2ca492fb
Build: Fixed typo
2022-11-23 16:19:12 +03:00
307bd7e536
Build: Restored document server install
2022-11-23 14:55:38 +03:00
cae6ff52f7
Fixed if statement for "sh" scripts
2022-11-23 13:18:22 +03:00
2dbcdadf68
Build: Fixed getting current branch for "sh" scripts
2022-11-23 12:10:29 +03:00
ca596efefd
Build: Added restart and clear scripts for docker
2022-11-23 12:08:51 +03:00
f3425ee8f5
Build: Added check for existence of remote repository
2022-11-22 13:01:52 +03:00
21a970573a
Build: Fixed end of line CRLF > LF
2022-11-22 11:49:58 +03:00
23e7b3962f
Added some fixed for build files
2022-11-21 22:30:13 +03:00
sk81.biz@gmail.com
af5829d92a
Mod package.json origin: https://system.onlyoffice.io
2022-11-21 14:39:12 +03:00
8b6ddc145b
Base windows docker builder
2022-11-21 11:17:19 +03:00
sk81.biz@gmail.com
d0119eda51
Fix run login, doceditor
2022-11-17 21:36:14 +03:00
sk81.biz@gmail.com
724749cbf0
Modify Dockerfile.app cmd config
2022-11-17 20:22:53 +03:00
sk81.biz@gmail.com
2814473cdd
Add docker-entypoint for servises login, doceditor
2022-11-17 20:06:43 +03:00
9dfcd25033
backend: update dependency dll
2022-11-14 14:11:10 +03:00
290875d91d
Update nodejs to v18.12.1
2022-11-10 17:53:55 +03:00
5d2c14c5b3
Added api-system to docker dev
2022-11-08 17:44:09 +03:00
Eugene Kozyrev
a49f3074be
Add enterprise build for Windows ( #988 )
2022-11-08 10:26:46 +02:00
0518c19426
Merge pull request #819 from ONLYOFFICE/feature/remove-waste
...
Feature/remove waste
2022-11-07 19:32:24 +03:00
d9b02f3f49
removed slnf
2022-11-07 19:23:31 +03:00
0f88170316
Fix yarn deploy on MacOS
2022-11-07 18:52:57 +03:00
bc358ae54c
build: added scipt for change service start timeout
2022-11-07 14:57:05 +03:00
14a64f4ad0
Merge branch 'develop' into feature/remove-waste
...
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
9b368efb53
Update build.backend.docker.sh
2022-11-02 18:09:08 +03:00
38950f567d
Fix stop/restart and build docker backend
...
+ Changed DOCUMENT_SERVER_IMAGE_NAME to current release
2022-11-02 14:29:41 +03:00
803d1e1185
Update start.backend.docker.sh
2022-11-02 14:23:11 +03:00
6e64a7525f
Create ds.dev.yml
...
+ Added opportunity to map license file inside Data/
2022-11-02 14:23:00 +03:00
ea132e83fc
Create clear.backend.docker.sh
2022-11-02 14:22:05 +03:00
sk81.biz@gmail.com
a255f7d1cd
Add check github
2022-11-01 10:17:29 +03:00
52b23cbf8b
healthcheck: added to ApiSystem/ClearEvents services. refactoring
2022-10-31 16:13:45 +03:00
f7cee67855
Create .dockerignore
2022-10-28 20:30:32 +03:00
9647236ea8
Update Dockerfile.dev
...
Fix docker git clone layer caching
2022-10-28 20:30:20 +03:00
641d63b0a5
Update stop.backend.docker.sh
2022-10-28 20:29:28 +03:00
Sergey Kirichenko
0b8360a0d7
Add docker image api_system ( #954 )
2022-10-27 13:39:21 +03:00
fe5385053c
rebbitmq: split default queue on separate queue
2022-10-26 17:21:37 +03:00
24f31b870c
Fix the apt-key deprecation error ( #950 )
2022-10-26 11:45:03 +03:00
440943f81b
Update run.translations.tests.sh
2022-10-24 13:31:11 +03:00
c1a61e0dbc
Create run.translations.tests.sh
2022-10-21 17:19:52 +03:00
84d98545f3
Update dev docker scripts
2022-10-20 15:01:25 +03:00
f01376cc56
Merge branch 'develop' into feature/remove-waste
2022-10-20 11:24:20 +03:00
56ef525cde
Removed --depth 1 on git clone
2022-10-19 18:41:24 +03:00
2767e172c6
Update core_base_domain
2022-10-19 18:40:54 +03:00
afc9d1ce17
Merge branch 'develop' into feature/remove-waste
2022-10-19 14:18:52 +03:00
16bb42d0af
fix ASC.Data.Storage.Encryption
2022-10-19 13:12:33 +03:00
521d69be08
Added set APP_CORE_BASE_DOMAIN and ENV_EXTENSION
2022-10-18 12:33:59 +03:00
e40e707640
Update docker-entrypoint.py
...
Fix set APP_CORE_BASE_DOMAIN equals ""
2022-10-18 12:32:13 +03:00
33ca5a8f78
Update db.yml
...
Map to local port 33060 for connection to host's clients
2022-10-18 10:49:49 +03:00
502aac91b1
ApiSystem: log, service
2022-10-17 18:24:50 +03:00
ed22136269
Merge branch 'develop' into feature/remove-waste
2022-10-17 14:31:57 +03:00
e0f1c0529d
Added stop, start, restart sh-files
2022-10-15 07:34:40 +03:00
1d0dddf196
Added mapping appsettings.dev.json from substitutions
2022-10-15 07:32:52 +03:00
fb8190b465
Added --no_ds param
2022-10-13 17:52:46 +03:00
0ee788fb00
Fix run migration-runner
2022-10-13 16:18:14 +03:00
b6c363e103
Added ROOT_DIR
2022-10-13 16:02:25 +03:00
82f0731d7d
Fix open files in DocEditor + refactoring
2022-10-13 15:26:37 +03:00
6cb1d7ac21
Added new variables setup + refactoring
2022-10-13 14:28:26 +03:00
6b12fe9e1e
Added public volume
2022-10-12 15:25:56 +03:00
5cda2d314f
Added nginx routing to Host client apps
2022-10-12 14:33:06 +03:00
8b52d93fd3
Init backend and environment build and run in docker
2022-10-11 16:01:03 +03:00
Sergey Kirichenko
8d528450dc
Modify root path ( #904 )
2022-10-11 12:44:22 +03:00
c16ef82df3
Update runMigrations.sh
...
Added execution flag (chmod +x)
2022-10-06 12:14:12 +03:00
0869ce4bfb
Create socket.sh
2022-10-05 14:44:41 +03:00
ec85cb896a
Update build.sh
2022-10-05 14:43:43 +03:00
6682ca850e
fix
2022-10-05 14:04:24 +03:00
f726879370
Build: Added MacOS build and run files
2022-10-03 16:26:34 +03:00
Eugene Kozyrev
51ba7c8628
Feature/Update Windows installation ( #857 )
...
* Add DocEditor service
Update windows installation project on develop
* Add ASC.Login service
* Delete onlyoffice-login.conf
* Add json configs substitutions
* Edit StartMigrationRunner custom action
* Set service run as NT AUTHORITY\LocalService
* Move config file substitutions to project
* Remove condition to SetMACHINEKEY
* Revert "Set service run as NT AUTHORITY\LocalService"
This reverts commit 3e9c578a652e38f346f7e7fd52eca4ab72dcf537.
* Fix nginx conf substitution
* Add Local Service permitions
* Add folders permitions
Move node.js service logs
* Fix
* Edit logpath
2022-09-28 17:02:59 +03:00
4001798d2a
Bugfix/Add new service and packages correction ( #839 )
...
* Add a login service
* Fix a typo
* Fix minor bugs
* Update build.sh
* Add login service to deb package
* Fix minor bugs
* Fix nginx configuration
* Fix minor bugs
* Add additional variables and replace the kafka service with redis\rabbitmq
2022-09-26 13:03:36 +03:00
6563d4b633
nlog: refactoring service name
2022-09-16 16:41:51 +03:00
1f07a7ddad
Merge branch 'develop' into feature/remove-waste
2022-09-13 17:14:49 +03:00
Sergey Kirichenko
dd21a1b290
Add github action ( #804 )
...
* Modified Dockerfile.app
* Add github workflow
* Modify GIT_BRANCH
* Modify Dockerfile.app, change github repo
* Add prefix for name services
* Add login image build
* Change nginx config loclahost to 127.0.0.1
* Del static login files from proxy image
* Modify environmet for yml files
* Fix build hooks
* Add env STATUS for build hooks
* For testinig dockerhub build
* Fix
* Branch for action feature/github-action-build-docker
* Modify hooks
* Modify hooks, develop branch for action
* Add service-login to proxy
* Action test amd64
* Action test amd64
* Git action build only amd64
* Github action from develop
2022-09-13 10:54:45 +03:00
25ae19d601
Merge branch 'develop' into feature/remove-waste
2022-09-09 11:52:13 +03:00
26df50c457
remove unused projects
2022-09-08 17:05:35 +03:00
b811d2bb14
Web: Removed useless for static build
2022-09-02 11:31:35 +03:00
8ce30932a3
Merge branch 'develop' into feature/login-ssr
2022-09-02 10:10:26 +03:00
23436472ed
Add new services and rebranding in packages\scripts ( #786 )
...
* Add new services, delete old services and kafka
* Corrections to appserver-configuration script
* Download the get-php script depending on the version of py
* Add doceditor and migration-runner services
* Docspace rebranding
* Rename a spec file
* Update build.sh
* Fixes in proxy package
* Rename script
* Fix launch of node js services
* Edit connection strings in migration-runner service
* Fix minor errors
* Update docspace-configuration.sh
* Update docspace-configuration.sh
* Add configuration of redis and rabbitmq services, as well as minor bug fixes
* Correct redis configuration
* Rebrand and add new services for deb package
* Fix build directory for deb package
* Revert "Fix build directory for deb package"
This reverts commit 9c711fc735c57e154e6b818988384d4b7e60c338.
* Add postinst for radicale package
* Fix python dependency
* Fix errors in control file
* Fix errors when building a deb package
* Update rules
* Rebranding of installation scripts
* Update build.spec
* Add migration for Docs Database
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-09-01 21:10:34 +03:00
14de652fa7
Build: Added new service Login SSR
2022-09-01 12:21:55 +03:00
TimofeyBoyko
0748afe854
Plugins: add logs, config and change service start
2022-08-26 12:51:43 +03:00
TimofeyBoyko
67cd56c62f
Plugins: fix build
2022-08-24 19:13:48 +03:00
TimofeyBoyko
4378905bbc
Build: Scripts: update plugins.bat
2022-08-24 12:35:23 +03:00
TimofeyBoyko
7042dca053
Merge branch 'develop' into feature/system-plugin-v2
2022-08-23 14:38:45 +03:00
TimofeyBoyko
c0259d1767
Web: add new service WebPlugins
2022-08-23 14:23:11 +03:00
7c03525732
build: check errors
2022-08-22 19:46:49 +03:00
d165a09a9c
install.bat requires administrative privileges
2022-08-22 18:52:13 +03:00
b5f4e30104
Merge branch 'develop' into feature/webhook-fix
2022-08-22 14:27:02 +03:00
1ea604ec36
fixed jenkinsfile
2022-08-22 14:26:19 +03:00
89157000e5
fixed createMigrations.bat
2022-08-16 17:46:29 +03:00
fa1258618a
fixed warnings
2022-08-12 17:49:34 +03:00
2e06c8fd58
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
...
# Conflicts:
# build/install/win/DocSpace.aip
2022-08-10 09:57:03 +03:00
Sergey Kirichenko
09be9c3907
Modify rabbit, redis docker running ( #754 )
...
* Modify rabbit, redis run
* Modify
STORAGE_ROOT
* Syntax modify
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-08-09 15:57:34 +03:00
Eugene Kozyrev
6b1dc19992
Feature/Rename AppServer to DocSpace in windiows installation ( #752 )
...
* Rename AppServer to DocSpace
* Rename project
2022-08-08 11:01:15 +03:00
Eugene Kozyrev
f1e2a0b145
Edit StartMigrationRunner execution sequence ( #753 )
2022-08-08 10:48:46 +03:00
Eugene Kozyrev
de61cedfd1
Feature/Refactor windows installation ( #749 )
...
* Refactor services start
* Change executable
* Add substitutions
* Add substitutions
* Add redis erlang rabbit
* Update AppServer.aip
* Add custom actions
* Add dialogs
* Update AppServer.aip
* Update AppServer.aip
* Add docspace_upgrade1.sql execution
* Add sql scripts
Delete ApiSystem service
Delete StorageEncryption service
Delete StorageMigration service
* Update AppServer.aip
* Update AppServer.aip
* Update AppServer.aip
* Refactor install project
* Add new exe files
* Add sql execution
* Upgrade MySQL version to 8.0.29
* Add new services
* Delete Thumbnails prop
* Edit sql scripts
* Delete sql connection
* Add migration runner
* Edit StartMigrationRunner
* Edit typo
* Edit fail condition
* Update publish
* Downgrade MySQL version to 8.0.21
* Update build-download-prereq.ps1
* Change dialogs banner
* Add debug migration run
* Update nginx.conf
* Add shortcuts
* Edit StartMigrationRunner
* Add PRODUCT_NAME
* Delete AppServer.back.aip
* Update AppServer.aip
* Update nginx.conf
* Delete shortcuts
* Add norestart flag
* Test
* Revert "Add norestart flag"
This reverts commit 535d37841caab542302ac2255c1fd3993a21b782.
* Update AppServer.aip
* Update AppServer.aip
* Add redistributable libs download
* Change packages download via NuGet
* Add RabbitMQ.Client package download
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-08-04 08:27:22 +03:00
bdf4db49da
Merge branch 'develop' into feature/docker-build-modify-frontend
2022-08-02 18:58:38 +03:00
sk81.biz@gmail.com
7781a3fa5c
Modify node version
2022-08-02 16:21:33 +03:00
650767c7ec
fixed build scripts
2022-08-02 15:24:19 +03:00
sk81.biz@gmail.com
77820a5cf9
Modify docker client build
2022-08-02 12:21:05 +03:00
c39b845da9
Build: Removed old fix path commands
2022-08-01 16:56:45 +03:00
7000cd55f6
Merge branch 'develop' into refactoring/client
2022-08-01 15:59:18 +03:00
d093c97b97
Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)
2022-08-01 15:37:33 +03:00
995d07deae
Web: Upgrade yarn to v3.2.2
2022-07-29 18:20:57 +03:00
sk81.biz@gmail.com
9a7a426680
Modify editor image build
2022-07-29 11:51:38 +03:00
Artem Tarasov
3ff0ae9d44
Merge branch 'develop' into bugfix/doceditor-build-fix
2022-07-28 17:40:54 +03:00
Artem Tarasov
5496cdbe05
Web: Doceditor/build: changed deploy path for editor
2022-07-28 17:39:25 +03:00
Sergey Kirichenko
a7ebccb5cb
Add doceditor docker service ( #742 )
...
* Add docker doceditor service
* fix
* Cosmetic modify
* Cosmetic modify
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-28 15:33:03 +03:00
Sergey Kirichenko
2a1883977c
Add feature for migration db in docker ( #740 )
...
* Add migration runner build image
* Add path for migration.runner build
* Modifiex build path migration.runner
* Fix migration-runner.yml
* Modify reference format for dockerhub
* Fix
* Check build reference format
* Fix build
* Modify migration runner build path
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-27 16:48:00 +03:00
3d22992b7d
Migrations: rename
2022-07-26 14:52:53 +03:00
e4df3b2371
fix
2022-07-26 13:39:16 +03:00
6e0aa3a6f9
fix
2022-07-26 13:21:21 +03:00
Sergey Kirichenko
5dfc123374
Add docker services build ( #739 )
...
* Add docker services
* fix build, fix notify
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-26 12:26:42 +03:00
e8bcfce41a
removed sql files
...
added runMigrations.bat
2022-07-25 19:03:37 +03:00
9a8177663b
added new service
2022-07-22 13:15:27 +03:00
Artem Tarasov
345dad709c
Merge branch 'develop' into feature/doceditor-ssr
2022-07-21 16:02:48 +03:00
b4cd5ffa0c
Merge branch 'develop' into feature/appserver-develop-docker-build
2022-07-21 15:05:34 +03:00
sk81.biz@gmail.com
f56ac822b2
Cosmetic modify
2022-07-21 11:47:05 +03:00
Artem Tarasov
55198d0e7f
Merge branch 'develop' into feature/doceditor-ssr
...
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
2022-07-10 11:23:44 +03:00
7af929fee8
Merge branch 'release/v1.2' into develop
...
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +03:00
sk81.biz@gmail.com
4e82c38cb5
Cosmetic modify
2022-07-05 18:09:51 +03:00
sk81.biz@gmail.com
5abd420172
Cosmetic modify
2022-07-05 17:36:58 +03:00
sk81.biz@gmail.com
5919ef43ed
Del docker-entrypoint-node py, sh; docker-entrypoint-dotnet.sh
2022-07-05 17:30:51 +03:00
sk81.biz@gmail.com
80e43d8848
Build docker services with python docker-entrypoint
2022-07-05 17:07:58 +03:00
542c29aa8a
Web: Translations: Added minimization for 'public/locales' directory
2022-07-03 15:55:53 +03:00
Artem Tarasov
2ef94f75da
Merge branch 'develop' into feature/doceditor-ssr
...
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
2022-07-01 23:41:10 +03:00
Sergey Kirichenko
732291b23e
Del peckages microf repo from Dockerfile.app
2022-06-28 09:41:07 +03:00
Sergey Kirichenko
6c75ff8970
Add repo for packages
2022-06-27 11:32:19 +03:00
Sergey Kirichenko
6af5b6ad0c
Fix hooks build(add build args SDK,RUN)
...
~
2022-06-24 21:55:28 +03:00
Sergey Kirichenko
1e814b863b
fix mysql settings
2022-06-24 17:47:36 +03:00
Sergey Kirichenko
cef80ac647
Fix people service run
2022-06-23 12:06:57 +03:00
Sergey Kirichenko
06beb4d7fd
Add parametrs for start dotnet services
2022-06-22 12:02:33 +03:00
e2cee2c2fc
Merge branch 'release/v1.2' into develop
...
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
945e9d8efe
moved from ddf515b8
2022-06-17 18:46:16 +03:00
Sergey Kirichenko
23da37d729
Fix
2022-06-17 11:35:02 +03:00
Sergey Kirichenko
bbf71a55eb
Fix config copy
2022-06-17 09:31:24 +03:00
56ece27e1b
moved from ddf515b8
2022-06-16 17:16:46 +03:00
Sergey Kirichenko
753cc8adab
Fix node image build
2022-06-15 12:20:18 +03:00
Sergey Kirichenko
0cd8c7dd3d
Fix run node
2022-06-15 11:23:52 +03:00
Sergey Kirichenko
060251afb4
Add kafka run config
2022-06-15 10:23:52 +03:00
Sergey Kirichenko
06a91659bc
Fix build
2022-06-14 11:27:15 +03:00
Artem Tarasov
2eebeb3c1a
Merge branch 'develop' into feature/doceditor-ssr
2022-06-14 11:22:23 +03:00
Sergey Kirichenko
fc7fb4edcc
Modify config files copying
2022-06-14 10:06:44 +03:00
Sergey Kirichenko
9f0e613d23
Mod pip to pip3 install
2022-06-10 13:23:54 +03:00
7b9e916396
Bugfix/packages correction ( #687 )
...
* Add database migration
* Delete projects, crm, calendar and mail services
* Delete projects, crm, calendar and mail services
* Add package version dependency
* Update a version of dotnet-sdk package
* Minor improvements in scripts
* Correction of 'invalid operation exception' error
* Fix mysql connection error
* Update nodejs version
* Fix appserver-backup startup error
* Change kafka user
* Fix running services after installation
* Add kafka directory
* Remove unused dependency
* Add onlyoffice group creation
* Revert "Remove unused dependency"
This reverts commit 4bc0d2fad409f472e33b2588ded68942fb794241.
* Add php update during installation
* Сode optimization
2022-06-10 13:11:33 +03:00
Sergey Kirichenko
543c412d84
Modify node images build
2022-06-10 12:40:55 +03:00
46ba74cc6f
moved from ddf515b8
2022-06-09 20:33:08 +03:00
Sergey Kirichenko
ccf2ea0302
Fix
2022-06-08 12:17:36 +03:00
Sergey Kirichenko
7529aabaca
Modify docker build
2022-06-07 10:37:38 +03:00
8c56de7a26
moved from ddf515b8
2022-06-05 18:44:37 +03:00
Sergey Kirichenko
22f158bcbb
Del build docker image ASC.Thumbnails
2022-06-02 14:48:34 +03:00
Sergey Kirichenko
0d714d89b4
Fix build
2022-06-02 12:08:50 +03:00
Sergey Kirichenko
c9a9746ef4
Del build storage-migration, storage-encryption
2022-06-02 11:28:39 +03:00
Sergey Kirichenko
be23489069
Modify build docker services
2022-06-02 10:50:36 +03:00
Sergey Kirichenko
dd77ba43d2
Fix
2022-06-01 17:04:02 +03:00
Sergey Kirichenko
6127118f63
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into feature/appserver-develop-docker-build
2022-06-01 11:00:27 +03:00
Sergey Kirichenko
bae7a6a1cb
Modify docker-entrypoint run file
2022-06-01 09:48:55 +03:00
Sergey Kirichenko
a6f672398e
Fix
2022-05-31 10:37:28 +03:00
Sergey Kirichenko
65e5074fd9
Fix build ASC.SsoAuth
2022-05-31 08:37:13 +03:00
Sergey Kirichenko
907e3222d6
Modify docker image building
2022-05-30 23:21:45 +03:00
Sergey Kirichenko
3d0d56d0fd
Modify docker-entrypoint
2022-05-25 12:00:22 +03:00
Sergey Kirichenko
fd9b837edc
Fix build
2022-05-25 11:55:07 +03:00
Sergey Kirichenko
3dcd1048b9
Build
2022-05-24 12:16:47 +03:00
dbeed862ab
Build: Removed old psl replacements
2022-05-20 19:13:01 +03:00
Timofey Boyko
394aafbe97
Add bat file for run e2e translations tests on personal
2022-05-19 15:26:36 +03:00
Eugene Kozyrev
4929c5f343
Upgrade ZooKeeper version to 3.7.1 in Windows installation ( #637 )
...
* Upgrade ZooKeeper version to 3.7.1
* Add versions variables
2022-05-12 19:06:09 +03:00
Sergey Kirichenko
d595c19eae
Fix socket.tets.json config path ( #634 )
2022-04-29 10:21:18 +03:00
Artem Tarasov
38e06018e5
Merge branch 'develop' into feature/doceditor-ssr
...
# Conflicts:
# packages/asc-web-common/api/client.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/src/StyledEditor.js
# yarn.lock
2022-04-28 14:12:06 +03:00
99d133a1af
build: Fix start services on run build/buildAndDeploy.PERSONAL.bat
2022-04-27 19:37:55 +03:00
1dff9e18c4
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
Eugene Kozyrev
ff7b192dbf
Change kafka-zookeeper projects language ( #626 )
...
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-04-21 12:06:15 +03:00
9ed24ab115
Build: Removed onlyoffice-editor.conf replace command
2022-04-14 17:24:23 +03:00
b877354203
BackupBackgroundTasks: port changed
2022-04-13 19:13:37 +03:00
Eugene Kozyrev
3b3f20db29
Add MySQL Installer Runner signing ( #618 )
2022-04-13 11:41:45 +03:00
Eugene Kozyrev
542df3d847
Change project language ( #612 )
2022-04-08 16:04:09 +03:00
Eugene Kozyrev
4012a9b713
Add ZooKeeper and Kafka connection check on Windows installation ( #610 )
...
* Add zookeeper/kafka connection check
* Edit build script
2022-04-08 13:04:51 +03:00
Eugene Kozyrev
5220e96b7e
Add elasticsearch connection check ( #606 )
2022-04-06 11:17:26 +03:00
Eugene Kozyrev
83ba7b1882
Add Windows installation files ( #601 )
...
* Add installation files
* Add DB migration
* Add deleting publish directory and back files
* Edit typo in DATABASE_MIGRATION property
* Delete sql scripts downloading
2022-04-01 16:43:34 +03:00
90623263e9
merge from feature/backend-refactor
2022-03-29 23:29:03 +03:00
Sergey Kirichenko
8940c0312a
Add feature for building images for different architecture ( #600 )
...
* Fix config
* del services, add migration env
* Fix build
* Fix sed
* Fix
* Delete commented code
2022-03-29 15:39:54 +03:00
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
ea8e68c950
add ssoAuth.bat with yarn install
2022-03-04 16:50:12 +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
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
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
c1fa203780
Feature/rpm support ( #192 )
...
* Create specfiles and systemd scripts
* Add fix
* Add systemd packaging
* add fix
* Add fix
* Add configuracion and fixes
* Update app-conf.sh and change cfg dir
* Add ability to start nodejs
* Update config
* Change owner of folders
* Delete temporary files
* Fix chmod config
* Fix configure docs
* Сode optimization
* Add configuration elasticsearch
* Rename directory
* Fix work with the name of branches that include '/'
* Fix work with the name of branches that include '/'
* Revert "Fix work with the name of branches that include '/'"
This reverts commit c0970cd84657dac503843720b0cdbce0130a329c.
* Revert "Fix work with the name of branches that include '/'"
This reverts commit 6ea3718df8950dd6ec87642195822a6ee433c40e.
* Add fix
* Add fix
* Add ability to change the release and version
* Fix docs configuration
* Add kafka configuration
* Add environment variables
* Add fix
* Add old rpms removal and buildroot removal
* Add OneClickInstall
* Correct the typo
* Move systemd from rpm to common
* Add a user-defined configuration option .json
* Add minor fix
* Add a machinekey generation
* Add a typo fix
* Change nodejs version
* Change the location of some folders
* Fix minor bugs
* Fix minor bugs
* Rename service directories
* Fix kafka privileges
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-03-19 15:50:47 +03:00
84a1102418
Build: Added new Web apps for run/install
2021-03-15 12:35:19 +03:00
8e1f5b30b5
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-03-13 16:01:41 +03:00
d696f18801
Jenkinsfile: fix notify
2021-02-24 15:37:40 +03:00
34d9eed580
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2021-02-24 10:30:42 +03:00
7ce0aa896d
Jenkins: fixed tests
2021-02-19 15:07:44 +03:00
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
f3cd204b14
Jenkins: run "notify" stage only once at first build
2021-02-10 16:03:44 +03:00
61cfd029d9
Added CRM
2021-01-26 20:36:03 +03:00
69922e7c48
Added ASC.Projects
2021-01-26 12:32:31 +03:00
789b547ccf
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-01-22 11:24:16 +03:00
88f37bdfc6
Merge branch 'develop' into feature/multi-stage-docker-env
2021-01-18 15:25:45 +03:00
Sergey Kirichenko
525654fdef
Correct spelling
2021-01-18 15:09:43 +03:00
