IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6867ded281
DocSpace-client/common/services
History
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
..
ASC.ApiSystem add support WindowsService/systemd for IHostBuilder 2021-04-23 16:54:39 +03:00
ASC.AuditTrail from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
ASC.Data.Backup Merge branch 'develop' into feature/remove-wq 2021-05-13 11:23:44 +03:00
ASC.Data.Storage.Encryption Merge branch 'develop' into feature/remove-wq 2021-05-13 11:23:44 +03:00
ASC.Data.Storage.Migration add support WindowsService/systemd for IHostBuilder 2021-04-23 16:54:39 +03:00
ASC.ElasticSearch refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
ASC.Feed.Aggregator Merge branch 'develop' into feature/dotnet5 2021-01-22 16:34:40 +03:00
ASC.Notify removed unused newtonsoft.json 2021-05-06 12:20:37 +03:00
ASC.Socket.IO.Svc add support WindowsService/systemd for IHostBuilder 2021-04-23 16:54:39 +03:00
ASC.Studio.Notify add support WindowsService/systemd for IHostBuilder 2021-04-23 16:54:39 +03:00
ASC.TelegramService removed unused newtonsoft.json 2021-05-06 12:20:37 +03:00
ASC.Thumbnails.Svc add support WindowsService/systemd for IHostBuilder 2021-04-23 16:54:39 +03:00
ASC.UrlShortener.Svc removed unused newtonsoft.json 2021-05-06 12:20:37 +03:00