Commit Graph

11 Commits

Author SHA1 Message Date
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
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +03:00
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
3ddb202c56 Scope: refactoring 2020-10-21 14:52:44 +03:00
f56f231c91 Refactoring: scope 2020-10-19 22:04:07 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00