|
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 |
|