Tatiana Lopaeva aa6c02b190 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # packages/asc-web-common/api/settings/index.js # packages/asc-web-common/components/PrivateRoute/index.js # packages/asc-web-common/store/SettingsStore.js # products/ASC.Files/Client/public/locales/en/SelectFile.json # products/ASC.Files/Client/public/locales/ru/SelectFile.json # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Client/src/Shell.jsx		2021-09-20 16:26:34 +03:00
..
ChunkedUploader	Files: FileHelper decorator	2021-06-18 23:31:46 +03:00
Configuration	Storage: fix resolve	2021-06-02 16:28:05 +03:00
DiscStorage	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
Encryption	Optimization: removed autofac ILifetimeScope	2021-08-10 17:56:38 +03:00
GoogleCloud	fixed warnings	2021-06-16 18:00:27 +03:00
Migration	Files: removed temp	2021-01-13 12:41:29 +03:00
protos	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
RackspaceCloud	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
S3	Storage: fix S3	2021-09-02 23:49:59 +03:00
Selectel
ASC.Data.Storage.csproj	fix	2021-08-30 19:17:57 +03:00
BaseStorage.cs	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
Constants.cs
CrossModuleTransferUtility.cs	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
DataList.cs
Extensions.cs	Common, db: moved from 08a01422	2021-05-17 14:35:00 +03:00
IDataStore.cs	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
IQuotaController.cs	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
PathUtils.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
ProgressStream.cs	Removed sq bugs and code smells	2020-10-16 16:21:59 +03:00
SecureHelper.cs
StaticUploader.cs	Security: added new method	2021-08-18 17:04:16 +03:00
StorageFactory.cs	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
StorageHandler.cs	fix Bug 51866	2021-09-05 22:59:14 +03:00
StorageUploader.cs	Security: added new method	2021-08-18 17:04:16 +03:00
TenantPath.cs
TenantQuotaController.cs	Storage: moved from 08a01422	2021-05-21 16:26:42 +03:00
WebPath.cs	Files: optimization	2021-08-13 18:59:17 +03:00
Wildcard.cs	Removed sq bugs and code smells	2020-10-16 16:21:59 +03:00