pavelbannov 6867ded281 Merge branch 'develop' into feature/remove-wq ... # Conflicts: # common/ASC.Common/DIHelper.cs # common/ASC.Common/Threading/DistributedTaskQueue.cs # common/ASC.Common/Threading/Progress/ProgressQueue.cs # common/ASC.Common/Threading/Workers/WorkerQueue.cs # common/ASC.Data.Reassigns/QueueWorker.cs # common/ASC.Data.Reassigns/ReassignProgressItem.cs # common/ASC.Data.Reassigns/RemoveProgressItem.cs # common/ASC.Data.Storage/StaticUploader.cs # common/ASC.Data.Storage/StorageUploader.cs # common/services/ASC.Data.Backup/BackupServiceLauncher.cs # common/services/ASC.Data.Backup/Service/BackupService.cs # common/services/ASC.Data.Backup/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Startup.cs # common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs # common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # products/ASC.Files/Core/Utils/FileMarker.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Core/Users/UserPhotoManager.cs		2021-05-13 11:23:44 +03:00
..
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Encryption: first version	2020-09-02 13:54:50 +03:00
ASC.Data.Storage.Encryption.csproj	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
EncryptionOperation.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00
EncryptionServiceLauncher.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
EncryptionServiceListener.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
EncryptionWorker.cs	Merge branch 'develop' into feature/remove-wq	2021-05-13 11:23:44 +03:00
NotifyHelper.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
Program.cs	add support WindowsService/systemd for IHostBuilder	2021-04-23 16:54:39 +03:00
Startup.cs	Fixed loading products, lazy loading webitemmanager	2021-01-26 12:29:50 +03:00