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