pavelbannov
4dbf1e70b7
# Conflicts: # common/ASC.ActiveDirectory/GlobalUsings.cs # common/ASC.Data.Storage/StorageFactory.cs # common/ASC.Data.Storage/TenantQuotaController.cs # migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs # packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Core/PublicResources/Resource.resx # web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs |
||
---|---|---|
.. | ||
ChunkedUploader | ||
Configuration | ||
DiscStorage | ||
Encryption | ||
GoogleCloud | ||
Log | ||
Migration | ||
protos | ||
RackspaceCloud | ||
S3 | ||
Selectel | ||
ASC.Data.Storage.csproj | ||
BaseStorage.cs | ||
Constants.cs | ||
CrossModuleTransferUtility.cs | ||
DataList.cs | ||
Extensions.cs | ||
GlobalUsings.cs | ||
IDataStore.cs | ||
IQuotaController.cs | ||
PathUtils.cs | ||
ProgressStream.cs | ||
SecureHelper.cs | ||
StaticUploader.cs | ||
StorageFactory.cs | ||
StorageHandler.cs | ||
StorageUploader.cs | ||
TenantPath.cs | ||
TenantQuotaController.cs | ||
WebPath.cs | ||
Wildcard.cs |