IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
e531654c54
DocSpace-buildtools/common/ASC.Data.Backup.Core
History
Ilya Oleshko e531654c54 Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-08-11 12:47:44 +03:00
..
Contracts Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
Core Merge branch 'develop' into feature/optimization-queries 2023-06-27 18:29:23 +03:00
EF refactoring 2023-06-09 14:28:49 +03:00
Exceptions migration personal: first version backup 2022-08-10 12:25:53 +03:00
Extensions
IntegrationEvents/Events remove waste modules 2022-08-30 14:16:41 +03:00
Log backup: add regions 2022-09-05 14:27:38 +03:00
protos
Service Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
Storage fix await using 2023-06-01 14:27:27 +03:00
Tasks Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
Utils Merge branch 'develop' into feature/migration_personal 2022-10-31 21:15:23 +03:00
ActionInvoker.cs fix 2022-11-16 11:18:24 +03:00
ASC.Data.Backup.Core.csproj backend: updated some dll 2023-08-10 19:16:25 +03:00
BackupAjaxHandler.cs Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
BackupFileUploadHandler.cs fix await using 2023-06-01 14:27:27 +03:00
BackupResource.az.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.bg.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.cs.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.de.resx added translations 2023-08-04 17:07:12 +03:00
BackupResource.Designer.cs added translations 2023-04-28 16:24:46 +03:00
BackupResource.el-GR.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.es.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.fi.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.fr.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.hy-AM.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.it.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.ja-JP.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.ko-KR.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.lv.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.nl.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.pl.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.pt-BR.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.pt.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.resx az resources 2022-06-27 14:00:23 +03:00
BackupResource.ru.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.sk.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.sl.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.tr.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.uk-UA.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.vi.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.zh-CN.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
GlobalUsings.cs CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture 2023-04-27 13:15:42 +03:00