Vashchuk Nikita
|
631dcdc2e8
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# products/ASC.CRM/Server/Api/VoipController.cs
# products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
# products/ASC.CRM/Server/Utils/PdfCreator.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
# web/ASC.Web.Core/Recaptcha.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-12 00:51:48 +03:00 |
|
|
|
9292ba4eee
|
analizators/s2589
|
2022-01-24 12:28:00 +03:00 |
|
|
|
a40b06648a
|
analizators/s3963
|
2021-12-28 19:01:12 +03:00 |
|
Vashchuk Nikita
|
43e2a65081
|
Spreading async in Files
|
2021-11-15 14:31:47 +03:00 |
|
|
|
5d94113e23
|
Backup: fix
|
2021-05-19 11:31:50 +03:00 |
|
|
|
b9c52c526e
|
Fixed DistributedTask
|
2021-05-18 21:24:22 +03:00 |
|
|
|
d01db1eed6
|
Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq
# Conflicts:
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
# common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/services/ASC.Data.Backup/BackupAjaxHandler.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-13 11:57:40 +03:00 |
|
|
|
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 |
|
|
|
ae69a9559e
|
Files: removed temp
|
2021-01-13 12:41:29 +03:00 |
|
|
|
60562d69a3
|
Files: test fix
|
2021-01-13 10:21:29 +03:00 |
|
|
|
b7d3cd8650
|
Files: test
|
2021-01-12 22:42:17 +03:00 |
|
|
|
88eac5b10a
|
Files: test
|
2021-01-12 21:51:39 +03:00 |
|
|
|
f6ca373137
|
MemoryCache -> IMemoryCache
|
2021-01-12 20:51:14 +03:00 |
|
|
|
13cf5e5ad0
|
Files: tests. long operations
|
2021-01-12 16:00:05 +03:00 |
|
|
|
b487adb9fc
|
Refactoting & optimization
|
2020-11-24 13:15:11 +03:00 |
|
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
SuhorukovAnton
|
2e4f612f93
|
remove-wq: fix encryption
|
2020-10-13 17:28:10 +03:00 |
|
|
|
38b204ca5a
|
DistributedTaskQueue: refactoring
|
2020-10-02 10:34:29 +03:00 |
|
|
|
3f5b8b77c4
|
DistributedTaskQueue: refactoring
|
2020-10-02 10:19:02 +03:00 |
|
|
|
88d7a0d267
|
DistributedTaskQueue: fix
|
2020-10-01 10:22:08 +03:00 |
|
|
|
90e61ba082
|
Added DistributedTaskProgress
|
2020-09-30 13:54:49 +03:00 |
|
|
|
e4d4db6563
|
Merge branch 'master' into feature/remove-wq
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Threading/Progress/ProgressBase.cs
# common/ASC.Common/Threading/Progress/ProgressQueue.cs
# common/ASC.Common/Threading/Workers/WorkerQueue.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
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
|
2020-09-29 19:46:40 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +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 |
|
|
|
df5925ffc1
|
Files: FileMarker. Replace WorkerQueue with DistributedTaskQueue
|
2020-08-06 13:53:34 +03:00 |
|
|
|
5650bc2a93
|
DistributedTaskQueue: configuring
|
2020-07-13 18:26:21 +03:00 |
|
|
|
cd3240a7f6
|
Removed LimitedConcurrencyLevelTaskScheduler
|
2020-07-13 14:11:36 +03:00 |
|
|
|
c780a881df
|
Files: fixed removing file method
|
2020-03-04 10:42:43 +03:00 |
|
|
|
96687f4fa6
|
Files: DI
|
2020-02-07 14:34:25 +03:00 |
|
|
|
09406eccf4
|
renamed InstanseId -> InstanceId, BaseCommonLinkUtilityFactory -> BaseCommonLinkUtilityExtension
|
2019-11-11 14:22:11 +03:00 |
|
|
|
5ec41ccaff
|
DI: removed appSettings
|
2019-10-14 11:23:45 +03:00 |
|
|
|
8c49db565f
|
ca1507
|
2019-08-16 13:15:25 +03:00 |
|
|
|
73774a29fa
|
IDE0067
|
2019-08-16 11:44:03 +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 |
|
|
|
cb5f732e76
|
Replaced ICacheNotify with ICacheNotify<>
Removed RedisCache
|
2019-07-22 15:31:09 +03:00 |
|
|
|
92ed33906c
|
init commit
|
2019-05-15 17:56:09 +03:00 |
|
