IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
bb5b8cccdd
DocSpace-client/common/ASC.Data.Storage
History
pavelbannov b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	config/appsettings.json
#	config/nlog.config
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/common/components/MoreLoginModal/index.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Core/CspSettingsHelper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-09-25 10:53:06 +03:00
..
ChunkedUploader removed Serializable attribute 2023-09-08 16:24:24 +03:00
Configuration removed Serializable attribute 2023-09-08 16:24:24 +03:00
DataOperators Merge branch 'develop' into feature/backup-s3-tar 2023-09-07 17:10:28 +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 backend: updated some dll 2023-08-08 19:43:14 +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 feature/backup-s3-tar 2023-09-07 17:10:28 +03:00
Selectel
Tar first version: backup s3 tar 2023-07-18 16:21:44 +03:00
ASC.Data.Storage.csproj backend: updated some dll 2023-08-10 19:16:25 +03:00
BaseStorage.cs Merge branch 'develop' into feature/backup-s3-tar 2023-08-29 14:31:16 +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 s3 tar backup refactoring 2023-07-20 20:33:51 +03:00
IDataStore.cs Merge branch 'develop' into feature/backup-s3-tar 2023-08-29 14:31:16 +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 Files: added storage handler for files_template module 2023-07-28 16:09:24 +03:00
StorageHandler.cs Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +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