DocSpace-client/common/services/ASC.Data.Backup
pavelbannov 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
..
Contracts Removed unused proto, added backup rewrite 2020-06-25 19:05:14 +03:00
Controllers Merge branch 'develop' into refactoring/scope 2020-11-04 15:22:43 +03:00
Core DI: fix 2020-10-28 23:02:03 +03:00
EF fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
Exceptions fix 2020-08-27 17:01:37 +03:00
Extensions fix warnings 2020-10-12 16:52:31 +03:00
Listerners Scope: refactoring 2020-10-19 18:53:15 +03:00
ModelApi connect-controlPanel: fix backup 2020-10-30 13:03:19 +03:00
Properties Backup: refactoring 2020-06-03 12:15:05 +03:00
protos encryption: add api start 2020-09-17 16:56:12 +03:00
Service Merge branch 'develop' into refactoring/scope 2020-11-04 15:22:43 +03:00
Storage Scope: refactoring 2020-10-19 18:53:15 +03:00
Tasks Scope: refactoring 2020-10-19 18:53:15 +03:00
Utils fix 2020-08-27 17:01:37 +03:00
ActionInvoker.cs Backup: ajaxpro removed 2020-06-15 11:19:40 +03:00
appsettings.json Backup: refactoring 2020-06-03 12:15:05 +03:00
ASC.Data.Backup.csproj References updated 2020-10-16 10:27:44 +03:00
BackupAjaxHandler.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
BackupServiceLauncher.cs Merge branch 'develop' into refactoring/scope 2020-11-04 15:22:43 +03:00
Program.cs Autofac: fix 2020-11-02 19:27:08 +03:00
Startup.cs Merge branch 'develop' into refactoring/scope 2020-11-04 15:22:43 +03:00