IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
f0f75c7c60
DocSpace-client/common/ASC.Data.Storage
History
Sergey Linnik b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeFullDto.cs
#	common/ASC.Core.Common/Core/UserInfo.cs
#	common/ASC.Core.Common/EF/FireBaseUser.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.IPSecurity/Models/IPRestriction.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Helpers/DocumentService.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Server/Api/EditorController.cs
#	products/ASC.Files/Server/Api/FilesController.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
#	products/ASC.Files/Server/Api/UploadController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	products/ASC.People/Server/Api/ContactsController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs
#	web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs
#	web/ASC.Web.Api/Api/Settings/LdapController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/NotificationController.cs
#	web/ASC.Web.Api/Api/Settings/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SsoController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/VersionController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
2023-08-01 17:07:05 +03:00
..
ChunkedUploader fix await using 2023-06-01 14:27:27 +03:00
Configuration Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
DiscStorage Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
Encryption fix await using 2023-06-01 14:27:27 +03:00
GoogleCloud Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
Log fixed DeleteExpiredService 2023-03-10 22:32:30 +03:00
Migration refactoring 2022-04-15 12:08:06 +03:00
protos
RackspaceCloud Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
S3 Merge branch 'develop' into fix-conflicts-merge 2023-07-21 16:51:49 +03:00
Selectel
ZipOperators fix await using 2023-06-01 14:27:27 +03:00
ASC.Data.Storage.csproj Merge branch 'master' into develop 2023-02-07 14:31:22 +03:00
BaseStorage.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
Constants.cs Storage: Constants: added secure key header 2023-04-27 17:40:15 +03:00
CrossModuleTransferUtility.cs fix await using 2023-06-01 14:27:27 +03:00
DataList.cs
GlobalUsings.cs chunk backup 2022-12-14 15:55:41 +03:00
IDataStore.cs Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
IQuotaController.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
PathUtils.cs code cleanup 2022-04-14 22:42:15 +03:00
SecureHelper.cs Merge branch 'develop' into feature/public-room-backend 2023-06-02 16:42:16 +03:00
StaticUploader.cs fix await using 2023-06-01 14:27:27 +03:00
StorageFactory.cs fix migrations 2023-06-27 12:18:04 +03:00
StorageHandler.cs Merge branch 'develop' into feature/public-room-backend 2023-07-12 14:37:37 +03:00
StorageUploader.cs WebstudioDbContext -async 2023-03-24 19:24:59 +03:00
TenantPath.cs GetDataStore tenant string to int 2022-10-28 15:23:51 +03:00
TenantQuotaController.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
WebPath.cs remove internal methods 2023-05-26 13:45:41 +03:00
Wildcard.cs code cleanup 2022-04-14 22:42:15 +03:00