IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,507 Commits 38 Branches 22 Tags 359 MiB
6ea363201b
Commit Graph

32 Commits

Author SHA1 Message Date
Sukhorukov Anton
c3fd12f2b5 Merge branch 'develop' into feature/data-migration 2024-02-14 12:16:54 +03:00
Evgeniy Antonyuk
3da388f94d Merge branch 'hotfix/v2.0.1' into develop 2024-02-06 20:15:57 +07:00
Maksim Chegulov
d9bac5cce4 Bug 65890 2024-01-17 12:45:13 +03:00
Alexey Safronov
2c5af9dfa4
Merge pull request #75 from ONLYOFFICE/feature/management 
Feature/management
 2023-12-07 18:20:50 +04:00
Andrey Savihin
ff453ea19e cfg: storage: visible false for systemwebplugins 2023-11-29 18:23:07 +03:00
Alexey Safronov
055a836888 Merge branch 'develop' into feature/data-migration 2023-11-22 17:35:37 +04:00
DmitrySychugov
79a4e818d2 Merge branch 'develop' into feature/management 
# Conflicts:
#	build.backend.docker.ps1
#	build.backend.docker.sh
#	clear.backend.docker.ps1
#	clear.backend.docker.sh
#	start/start.backend.docker.ps1
#	start/start.backend.docker.sh
 2023-11-09 19:00:55 +05:00
Andrey Savihin
97e22f5424 config: added storage for rebranding logos 2023-10-27 16:11:29 +03:00
pavelbannov
2b112d9344 Store: added IDataStoreValidator 2023-10-20 17:25:21 +03:00
Alexey Safronov
ce19e172c4 Merge branch 'develop' into feature/data-migration 
# Conflicts:
#	ASC.Web.sln
#	ASC.Web.slnf
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Data.Storage/DataOperators/DataOperatorFactory.cs
#	common/ASC.Data.Storage/DataOperators/IDataOperator.cs
#	common/ASC.Data.Storage/DataOperators/ReadOperators/BaseReadOperator.cs
#	common/ASC.Data.Storage/DataOperators/ReadOperators/TarReadOperator.cs
#	common/ASC.Data.Storage/DataOperators/ReadOperators/ZipReadOperator.cs
#	common/ASC.Migration/ASC.Migration.Core.csproj
#	common/ASC.Migration/Core/AbstractMigration.cs
#	common/ASC.Migration/Core/IMigration.cs
#	common/ASC.Migration/Core/ImportableEntity.cs
#	common/ASC.Migration/Core/MigrationIntegrationEvent.cs
#	common/ASC.Migration/Core/MigrationIntegrationEventHandler.cs
#	common/ASC.Migration/Core/MigrationLogger.cs
#	common/ASC.Migration/Core/MigrationParseIntegrationEvent.cs
#	common/ASC.Migration/Core/Models/Api/ImportableApiEntity.cs
#	common/ASC.Migration/Core/Models/Api/MigratingApiFiles.cs
#	common/ASC.Migration/Core/Models/Api/MigratingApiGroup.cs
#	common/ASC.Migration/Core/Models/Api/MigratingApiUser.cs
#	common/ASC.Migration/Core/Models/Api/MigrationApiInfo.cs
#	common/ASC.Migration/Core/Models/Api/MigrationCore.cs
#	common/ASC.Migration/Core/Models/Api/MigratorMeta.cs
#	common/ASC.Migration/Core/Models/MigratingFiles.cs
#	common/ASC.Migration/Core/Models/MigratingUser.cs
#	common/ASC.Migration/Core/Models/MigrationInfo.cs
#	common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceFiles.cs
#	common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceUser.cs
#	common/ASC.Migration/Core/Providers/ASC/Models/WorkspaceMigrationInfo.cs
#	common/ASC.Migration/Core/Providers/GoogleWorkspace/GoogleWorkspaceMigration.cs
#	common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingFiles.cs
#	common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingUser.cs
#	common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigrationInfo.cs
#	common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingFiles.cs
#	common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingUser.cs
#	common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigrationInfo.cs
#	common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/Parse/NCUser.cs
#	common/ASC.Migration/Core/Providers/NextcloudWorkspace/NextcloudWorkspaceMigration.cs
#	common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingFiles.cs
#	common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingUser.cs
#	common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigrationinfo.cs
#	common/ASC.Migration/Core/Providers/OwnCloud/Models/Parse/OCUser.cs
#	common/ASC.Migration/Core/Providers/OwnCloud/OwnCloudMigration.cs
#	common/ASC.Migration/GlobalUsings.cs
#	common/ASC.Migration/Resources/MigrationResource.Designer.cs
#	common/ASC.Migration/Resources/MigrationResource.resx
#	config/nginx/onlyoffice.conf
#	packages/client/public/locales/en/People.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/ru/People.json
#	packages/client/public/locales/ru/Settings.json
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/HistoryHeader.js
#	packages/client/src/pages/PortalSettings/utils/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/client/src/routes/portalSettings.js
#	packages/client/src/store/DialogsStore.js
#	packages/client/src/store/index.js
#	packages/common/api/settings/index.js
#	packages/common/utils/axiosClient.js
#	packages/components/file-input/index.js
#	packages/components/paging/index.js
#	packages/components/paging/styled-paging.js
#	packages/components/progress-bar/index.js
#	packages/components/table-container/TableGroupMenu.js
#	packages/components/table-container/TableHeaderCell.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
#	products/ASC.Files/Core/Core/CountRoomFeature.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Startup.cs
#	products/ASC.People/Server/Startup.cs
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/ApiModels/RequestsDto/FinishDto.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/MigrationStatusDto.cs
#	web/ASC.Web.Api/GlobalUsings.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
#	web/ASC.Web.Studio/GlobalUsings.cs
#	web/ASC.Web.Studio/IntegrationEvents/RemovePortalIntegrationEventHandler.cs
#	web/ASC.Web.Studio/Program.cs
#	web/ASC.Web.Studio/Startup.cs
 2023-10-04 14:49:14 +04:00
Alexey Safronov
bc9f96ee7d Fix bad merge 2023-10-03 19:13:51 +04:00
Alexey Bannov
78a222ebd1 merge from develop 2023-10-03 17:38:22 +03:00
Alexey Bannov
25241c61d4 drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
Alexey Bannov
09466caed0 moved config to build/condig folder 2023-10-02 13:16:45 +03:00
Andrey Savihin
c1a75f0ae2 ASC.Web.Core: WebPluginManager: small fixes 2023-09-19 14:06:04 +03:00
Andrey Savihin
bb7da689cb ASC.Web.Core: WebPluginManager: separate storage for system plugins 2023-09-05 18:44:14 +03:00
Anton Sukhorukov
41c581d621 fix migration path 2023-08-31 11:48:36 +03:00
Anton Sukhorukov
03a70757ab migration: add uploader 2023-08-30 19:40:45 +03:00
Anton Sukhorukov
02d6f36c9f migration get log and finish 2023-08-17 17:29:56 +03:00
Andrey Savihin
b2810c1234 config: web plugins settings 2023-07-14 22:31:26 +03:00
Andrey Savihin
0f0cfc6094 config: added storage for web plugins 2023-07-05 12:24:21 +03:00
pavelbannov
d4833bacbf fix 2023-04-10 17:28:20 +03:00
pavelbannov
df62b3862f Merge branch 'release/v1.0.0' into develop 
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/components/scrollbar/custom-scrollbars-virtual-list.js
#	products/ASC.Files/Core/Core/CountRoomFeature.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Helpers/Global.cs
 2023-04-10 17:24:09 +03:00
Alexey Bannov
f687c16a6b fixed StorageHandler class 2022-12-22 18:48:30 +03:00
Vashchuk Nikita
38857366e1 Bug 59715 - Studio: Users. Аватарки пользователей не кешируются браузером 2022-12-12 14:09:29 +05:00
SuhorukovAnton
ded6b08e0e fix GetTmpFilePath 2022-10-11 15:29:23 +03:00
MaksimChegulov
734670404e Files: fix access 2022-08-23 14:55:03 +03:00
MaksimChegulov
848751220c Files: added logos for rooms 2022-06-02 21:41:16 +03:00
pavelbannov
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
SuhorukovAnton
eb18133e4b encryption: bugfix 2020-09-14 13:32:20 +03:00
pavelbannov
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
pavelbannov
48217aedd8 External config 2019-06-21 11:03:42 +03:00