Commit Graph

18 Commits

Author SHA1 Message Date
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
682ca73a91 Files: fix tests 2021-01-12 13:16:11 +03:00
2bb8502526 Core: fix parse 2020-12-11 13:34:23 +03:00
d00d13bb8f Core: fix 2020-12-11 13:03:30 +03:00
156bf72046 Core: fix GetProperty 2020-12-11 12:48:21 +03:00
c764812d3a Common: refactoring 2020-12-04 16:48:54 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
90e61ba082 Added DistributedTaskProgress 2020-09-30 13:54:49 +03:00
e4acc15773 removed WorkerQueue, ProgressQueue 2020-09-29 16:02:47 +03:00
992ab07b87 Common: Reassign. DistributedTaskQueue 2020-08-07 18:42:58 +03:00
ffc756f32b Backup: DistributedTaskQueue 2020-08-06 21:07:27 +03:00
e986f73293 Files: fixed ComposeFileOperation 2020-03-20 11:11:38 +03:00
5671ee6133 Files: fixed long operation 2020-03-06 17:48:58 +03:00
c780a881df Files: fixed removing file method 2020-03-04 10:42:43 +03:00
09406eccf4 renamed InstanseId -> InstanceId, BaseCommonLinkUtilityFactory -> BaseCommonLinkUtilityExtension 2019-11-11 14:22:11 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
0a0cfbbf88 Common: added distributed task cache
AscCache: removed Default
2019-07-23 16:12:16 +03:00
92ed33906c init commit 2019-05-15 17:56:09 +03:00