|
|
3ef16948fc
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/services/ASC.Data.Backup/Core/NotifyHelper.cs
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
|
2021-06-08 15:03:49 +03:00 |
|
|
|
3635905167
|
Backup: fixed link
|
2021-06-02 17:02:19 +03:00 |
|
|
|
d741e91e96
|
Backup: fixed notify
|
2021-06-02 15:00:36 +03:00 |
|
|
|
d3fb9f8384
|
fix
|
2021-05-31 14:08:13 +03:00 |
|
|
|
570ede7bba
|
Merge branch 'develop' into feature/11.5.2
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-31 13:32:51 +03:00 |
|
|
|
5d94113e23
|
Backup: fix
|
2021-05-19 11:31:50 +03:00 |
|
|
|
8a3db93d0d
|
Backup: moved from 08a01422
|
2021-05-17 21:27:39 +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 |
|
|
|
3aae413e12
|
replace Path.Combine to CrossPlatform.PathCombine
|
2021-04-16 16:26:26 +03:00 |
|
|
|
1623241d8a
|
Code cleanup
|
2020-11-17 13:00:01 +03:00 |
|
|
|
79ea471098
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Core.Common/BaseCommonLinkUtility.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Migration/Program.cs
# common/services/ASC.Notify/NotifyServiceLauncher.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Socket.IO.Svc/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Thumbnails.Svc/Program.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-11-04 15:22:43 +03:00 |
|
|
|
790d2fc934
|
Restore: fix
|
2020-11-03 16:02:54 +03:00 |
|
SuhorukovAnton
|
c1701500fa
|
connect-controlPanel: fix backup
|
2020-10-30 13:03:19 +03:00 |
|
SuhorukovAnton
|
c94b0ee340
|
connect-controlPanel: fix branding, backup and restore
|
2020-10-28 16:21:24 +03:00 |
|
|
|
035a98b878
|
Refactoring: scope. Backup
|
2020-10-26 16:38:21 +03:00 |
|
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
|
3f5b8b77c4
|
DistributedTaskQueue: refactoring
|
2020-10-02 10:19:02 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +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 |
|
|
|
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
|
132a6b05ae
|
scope: add deconstructs
|
2020-08-31 11:18:07 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a4146fcce7
|
Backup: refactoring
|
2020-05-29 17:48:27 +03:00 |
|
SuhorukovAnton
|
65739dac46
|
Backup: fix Startup
|
2020-05-28 16:37:36 +03:00 |
|
