DmitrySychugov
|
0266838db5
|
Merge branch 'develop' into feature/management
# Conflicts:
# build.backend.docker.sh
# build.static.bat
# common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
# common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
# common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
# common/ASC.Data.Backup.Core/Service/BackupService.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ApiSystem/Controllers/SettingsController.cs
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Models/SettingsModel.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup/Api/BackupController.cs
# common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
# common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
# common/services/ASC.Data.Backup/GlobalUsings.cs
# frontend.code-workspace
# frontend.macos.code-workspace
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# package.json
# packages/client/package.json
# packages/client/src/components/MainBar/index.js
# packages/client/src/components/NavMenu/index.js
# packages/client/src/components/NavMenu/sub-components/header-nav.js
# packages/client/src/components/NavMenu/sub-components/header.js
# packages/client/src/pages/Confirm/sub-components/auth.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/common/sub-components/loaderWhiteLabel.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/client/webpack.config.js
# packages/common/api/index.js
# packages/common/api/portal/index.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-apps.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/Article/sub-components/article-hide-menu-button.js
# packages/common/components/Article/sub-components/article-profile.js
# packages/common/store/AuthStore.js
# packages/common/store/SettingsStore.js
# packages/common/utils/axiosClient.js
# packages/common/utils/whiteLabelHelper.js
# packages/components/context-menu/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
# public/locales/en/Common.json
# public/scripts/config.json
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# yarn.lock
|
2023-10-04 21:06:09 +05:00 |
|
|
|
e3ad782228
|
Update build.frontend.bat
|
2023-10-04 12:19:23 +04:00 |
|
|
|
fc503d8528
|
merge from develop
|
2023-10-04 00:26:33 +03:00 |
|
|
|
7a62724a82
|
*.log to gitignore
|
2023-10-03 19:59:05 +03:00 |
|
|
|
5085618cc3
|
SSR: fix path
|
2023-10-03 19:58:23 +03:00 |
|
|
|
b099c11535
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-buildtools into develop
|
2023-10-03 19:40:21 +04:00 |
|
|
|
49faa6de95
|
Fix build docker dev (disabled ASC.TelegramReports)
|
2023-10-03 19:39:24 +04:00 |
|
|
|
db6a7eec48
|
Merge pull request #3 from ONLYOFFICE/master
Merge master into develop
|
2023-10-03 18:33:28 +03:00 |
|
|
|
e2d1e2378f
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-buildtools into develop
|
2023-10-03 19:16:06 +04:00 |
|
|
|
1f97bc5efc
|
fixed migration and test
|
2023-10-03 18:14:05 +03:00 |
|
|
|
bc9f96ee7d
|
Fix bad merge
|
2023-10-03 19:13:51 +04:00 |
|
|
|
09e037b88e
|
Merge pull request #2 from ONLYOFFICE/release/separation
Merge release/separation into master
|
2023-10-03 18:04:55 +03:00 |
|
|
|
78a222ebd1
|
merge from develop
|
2023-10-03 17:38:22 +03:00 |
|
|
|
30035a26f4
|
Fix path
|
2023-10-03 17:33:42 +03:00 |
|
|
|
b0d2ba9a1a
|
Merge pull request #1 from ONLYOFFICE/release/separation
moved config to build/condig folder
|
2023-10-03 18:32:41 +04:00 |
|
|
|
cef367ef23
|
Fix path for build
|
2023-10-03 17:05:32 +03:00 |
|
|
|
314d0e56ac
|
Merge branch 'release/separation' of github.com:ONLYOFFICE/DocSpace-buildtools into release/separation
|
2023-10-03 16:28:24 +03:00 |
|
|
|
67fd083eec
|
Modify path for docker build
|
2023-10-03 16:28:10 +03:00 |
|
|
|
c5f981eddd
|
fixed build path
|
2023-10-03 13:25:25 +03:00 |
|
|
|
2fb9c7fe70
|
Merge branch 'release/separation' of github.com:ONLYOFFICE/DocSpace-buildtools into release/separation
|
2023-10-03 12:57:23 +04:00 |
|
|
|
6e5c8f0616
|
Update path
|
2023-10-03 12:57:14 +04:00 |
|
|
|
30d85c8986
|
Fixed .sh docker build path
|
2023-10-03 11:50:40 +03:00 |
|
|
|
3031e5024b
|
Fix running client's translations tests
|
2023-10-03 12:43:20 +04:00 |
|
|
|
3aa34ef2b5
|
Merge branch 'release/separation' of github.com:ONLYOFFICE/DocSpace-buildtools into release/separation
|
2023-10-03 12:38:23 +04:00 |
|
|
|
22d63050d1
|
Removed client script
|
2023-10-03 12:37:58 +04:00 |
|
|
|
247bcd6fd2
|
path modify
|
2023-10-03 11:23:55 +03:00 |
|
|
|
88c8ca3bf8
|
path modify
|
2023-10-03 11:19:49 +03:00 |
|
|
|
e1d0bb5f1d
|
Applied chmod +x for *.sh scripts
Issue: OCI runtime create failed: permission denied: unknown
|
2023-10-03 11:29:50 +04:00 |
|
|
|
1584336d5f
|
replace build => buildtools
|
2023-10-02 18:09:10 +03:00 |
|
|
|
6bb5f6a3dc
|
Fixed scripts on unix
|
2023-10-02 17:14:30 +03:00 |
|
|
|
c0ccfb0a6a
|
Fixed scripts on windows
|
2023-10-02 17:14:17 +03:00 |
|
|
|
de67295456
|
change build => buildtools path
|
2023-10-02 17:10:08 +03:00 |
|
|
|
5237a71e64
|
Merge branch 'release/separation' of https://github.com/ONLYOFFICE/DocSpace-buildtools into release/separation
|
2023-10-02 16:52:37 +04:00 |
|
|
|
dedb8cf3b3
|
Updated paths and permissions
|
2023-10-02 16:52:30 +04:00 |
|
|
|
b5985e1d0e
|
fixed build.backend.bat
|
2023-10-02 15:30:39 +03:00 |
|
|
|
25241c61d4
|
drop all files for backend/frontend
|
2023-10-02 13:23:37 +03:00 |
|
|
|
09466caed0
|
moved config to build/condig folder
|
2023-10-02 13:16:45 +03:00 |
|
|
|
55d92a8fa6
|
nginx: fixed log
|
2023-09-29 21:59:55 +03:00 |
|
|
|
227531280d
|
Merge pull request #1765 from ONLYOFFICE/feature/creating-room-from-one-folder
feature/creating-room-from-one-folder
|
2023-09-29 19:29:04 +04:00 |
|
|
|
44c6720b5d
|
Merge branch 'develop' into feature/creating-room-from-one-folder
|
2023-09-29 19:17:15 +04:00 |
|
|
|
4d19a8b212
|
Merge pull request #1675 from ONLYOFFICE/feature/web-plugins
Feature/web plugins
|
2023-09-29 18:58:13 +04:00 |
|
|
|
692975b4ea
|
Web:Client:Plugins: add beta badge
|
2023-09-29 17:48:19 +03:00 |
|
|
|
4c9d5e9662
|
Web:Client:Plugins: hide upload button
|
2023-09-29 17:45:51 +03:00 |
|
|
|
18d5c7c659
|
Web: disable upload and delete plugin
|
2023-09-29 17:45:28 +03:00 |
|
|
|
2987cf797b
|
nginx: support pass for redis. bug fixed
|
2023-09-29 17:26:43 +03:00 |
|
|
|
dade84f85e
|
Merge branch 'feature/web-plugins' of github.com:ONLYOFFICE/DocSpace into feature/web-plugins
|
2023-09-29 17:15:06 +03:00 |
|
|
|
13d090c178
|
Web: Added ru translations + autofixes
|
2023-09-29 17:59:55 +04:00 |
|
|
|
db4abb80e8
|
Web:Client:Plugin: delete console log
|
2023-09-29 16:58:38 +03:00 |
|
|
|
0d00d85a76
|
Web:Client:Plugin: fix delete
|
2023-09-29 16:54:32 +03:00 |
|
|
|
0d8bd872d6
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 17:21:34 +04:00 |
|
