ONLYOFFICE DocSpace is a room-based collaborative platform which allows organizing a clear file structure depending on users' needs or project goals. Flexible access permissions and user roles allow fine-tuning the access to the whole space or separate rooms.
Go to file
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
common/ASC.Migration/Core Merge branch 'develop' into feature/data-migration 2023-10-04 14:49:14 +04:00
config Merge branch 'develop' into feature/data-migration 2023-10-04 14:49:14 +04:00
install Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-buildtools into develop 2023-10-03 19:40:21 +04:00
packages/client/src Merge branch 'develop' into feature/data-migration 2023-10-04 14:49:14 +04:00
public/images Merge branch 'develop' into feature/data-migration 2023-10-04 14:49:14 +04:00
run merge from develop 2023-10-04 00:26:33 +03:00
scripts merge from develop 2023-10-04 00:26:33 +03:00
start merge from develop 2023-10-03 17:38:22 +03:00
tools drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
web/ASC.Web.Api/Api Merge branch 'develop' into feature/data-migration 2023-10-04 14:49:14 +04:00
.gitignore *.log to gitignore 2023-10-03 19:59:05 +03:00
build.backend.bat fixed build.backend.bat 2023-10-02 15:30:39 +03:00
build.backend.docker.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
build.backend.docker.ps1 merge from develop 2023-10-03 17:38:22 +03:00
build.backend.docker.sh Fix bad merge 2023-10-03 19:13:51 +04:00
build.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
build.document.server.docker.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
build.document.server.docker.ps1 Fixed scripts on windows 2023-10-02 17:14:17 +03:00
build.frontend.bat Update build.frontend.bat 2023-10-04 12:19:23 +04:00
build.sh Updated paths and permissions 2023-10-02 16:52:30 +04:00
build.static.bat fixed build path 2023-10-03 13:25:25 +03:00
buildAndDeploy.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
clear.backend.docker.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
clear.backend.docker.ps1 Fixed scripts on windows 2023-10-02 17:14:17 +03:00
clear.backend.docker.sh replace build => buildtools 2023-10-02 18:09:10 +03:00
createMigrations.bat fixed migration and test 2023-10-03 18:14:05 +03:00
Jenkinsfile drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
publish.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
run.backend.translations.tests.bat fixed migration and test 2023-10-03 18:14:05 +03:00
run.backend.translations.tests.sh merge from develop 2023-10-03 17:38:22 +03:00
run.e2e.test.bat replace build => buildtools 2023-10-02 18:09:10 +03:00
run.e2e.translations.tests.bat replace build => buildtools 2023-10-02 18:09:10 +03:00
run.e2e.translations.tests.personal.bat replace build => buildtools 2023-10-02 18:09:10 +03:00
run.translations.spellcheck.test.bat Update path 2023-10-03 12:57:14 +04:00
run.translations.spellcheck.test.sh Update path 2023-10-03 12:57:14 +04:00
run.translations.tests.bat Fix running client's translations tests 2023-10-03 12:43:20 +04:00
run.translations.tests.sh Fix running client's translations tests 2023-10-03 12:43:20 +04:00
runasadmin.bat drop all files for backend/frontend 2023-10-02 13:23:37 +03:00
runMigrations.bat fixed migration and test 2023-10-03 18:14:05 +03:00
runMigrations.sh Updated paths and permissions 2023-10-02 16:52:30 +04:00
runMigrations.standalone.bat fixed migration and test 2023-10-03 18:14:05 +03:00