Commit Graph

42 Commits

Author SHA1 Message Date
SuhorukovAnton
ab84f48a86 remove-wq: refactoring 2020-10-14 17:26:18 +03:00
3f5b8b77c4 DistributedTaskQueue: refactoring 2020-10-02 10:19:02 +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
a085e8ef38 Merge branch 'master' into feature/release-11.0.0
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
2020-09-23 14:00:24 +03:00
6f5cc4a447 Api: fix 2020-09-23 13:55:39 +03:00
dc6b0d2c6c ASC.Data.Storage moved from release/11 4414f77b 2020-09-15 18:16:37 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
8e3e73c746 Scope: fix 2020-09-04 13:10:19 +03:00
SuhorukovAnton
90f1c4fa3d Merge branch 'master' into feature/scope 2020-08-31 11:29:44 +03:00
SuhorukovAnton
132a6b05ae scope: add deconstructs 2020-08-31 11:18:07 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
SuhorukovAnton
055e787d63 scope: fix 2020-08-24 21:41:06 +03:00
SuhorukovAnton
eef5c3e4f3 scope: merge fix 2020-08-16 13:11:15 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
72426588c5 Backup: configure 2020-08-06 22:53:50 +03:00
0b31269c8e Backup: removed BackupServiceNotifier 2020-08-06 22:20:37 +03:00
ffc756f32b Backup: DistributedTaskQueue 2020-08-06 21:07:27 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
3f97755c92 Backup: fix notify 2020-06-29 15:45:38 +03:00
eb6be17333 Backup: removed notify reference 2020-06-29 12:32:43 +03:00
197f468bf7 Removed unused proto, added backup rewrite 2020-06-25 19:05:14 +03:00
SuhorukovAnton
4e839c9b11 Backup: transfer to ASC.Data.Backup 2020-06-23 13:48:36 +03:00
ca9af1080c Backup: refactoring 2020-06-17 10:49:17 +03:00
b36dac0cb4 Backup: fix 2020-06-16 19:04:40 +03:00
b35a60cac0 Backup: added DeleteBackupRequest 2020-06-16 17:46:10 +03:00
fc0826b60d Backup: service, progress 2020-06-16 14:34:44 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
68575e5048 Backup: ajaxpro removed 2020-06-15 11:19:40 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
eb7a026025 Backup: added autofac 2020-06-08 14:57:45 +03:00
SuhorukovAnton
af2295f98a Backup: fix 2020-06-08 13:40:26 +03:00
725955e851 ProgressQueue: fix 2020-06-08 12:44:01 +03:00
5fb753b528 Backup: fix start 2020-06-08 11:17:54 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
SuhorukovAnton
1796c682a4 Backup: add backup.json and BackupSettings.cs, fix BackupWorker 2020-06-01 13:33:39 +03:00
0ff1f8249d Backup: refactoring 2020-05-29 17:50:39 +03:00
a4146fcce7 Backup: refactoring 2020-05-29 17:48:27 +03:00
SuhorukovAnton
65739dac46 Backup: fix Startup 2020-05-28 16:37:36 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
SuhorukovAnton
e4881214a4 Backup: fix SQL 2020-05-26 11:52:47 +03:00
SuhorukovAnton
6acb0d4208 creating 2020-05-20 18:14:44 +03:00