pavelbannov 545bacfaf0 Merge branch 'develop' into fix-conflicts-merge ... # Conflicts: # packages/client/src/pages/VersionHistory/Section/Body/index.js # products/ASC.Files/Core/Configuration/FilesSettings.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Security/FileSecurity.cs # products/ASC.Files/Core/Core/Security/FileShareOptions.cs # products/ASC.Files/Server/Api/FoldersController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs		2023-07-21 16:51:49 +03:00
..
ChunkedUploader	fix await using	2023-06-01 14:27:27 +03:00
Configuration	async refactoring	2023-05-19 14:42:02 +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	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
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	added new license headers	2022-03-15 21:00:53 +03:00
GlobalUsings.cs	chunk backup	2022-12-14 15:55:41 +03:00
IDataStore.cs	Merge branch 'master' into develop	2023-07-18 19:26:32 +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