pavelbannov d8fb67f683 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Context/SecurityContext.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # web/ASC.Web.Api/Controllers/AuthenticationController.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs # web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs # web/ASC.Web.Core/Utility/CommonLinkUtility.cs		2019-09-27 13:45:37 +03:00
..
Billing	DI: configuration	2019-09-23 15:20:08 +03:00
Caching	DI: SubscriptionManager	2019-09-19 16:43:28 +03:00
Configuration	DI TenantManager	2019-09-20 15:20:03 +03:00
Context	Merge branch 'master' into refactoring/di	2019-09-27 13:45:37 +03:00
Contracts	Code Cleanup	2019-08-15 15:04:42 +03:00
Core	DI: configuration	2019-09-23 15:20:08 +03:00
Data	Merge branch 'master' into refactoring/di	2019-09-25 18:56:28 +03:00
Notify	DI: configuration	2019-09-24 13:32:12 +03:00
Properties	Code Cleanup	2019-08-15 15:04:42 +03:00
protos	DI: BaseSettings	2019-09-13 14:18:27 +03:00
Security	Merge branch 'master' into refactoring/di	2019-09-27 13:45:37 +03:00
Settings	DI: TenantManager	2019-09-20 15:47:00 +03:00
Tenants	DI: configuration	2019-09-24 13:32:12 +03:00
Tests	DI: configuration	2019-09-24 13:32:12 +03:00
Users	Merge branch 'master' into refactoring/di	2019-09-27 13:45:37 +03:00
WhiteLabel	DI: configuration	2019-09-23 15:20:08 +03:00
ASC.Core.Common.csproj	Merge branch 'master' into refactoring/di	2019-09-25 18:56:28 +03:00
BaseCommonLinkUtility.cs	BaseCommonLinkUtility optimization	2019-09-20 12:30:27 +03:00
HostedSolution.cs	DI: configuration	2019-09-24 13:32:12 +03:00
MultiRegionHostedSolution.cs	IDE0063	2019-08-15 18:08:40 +03:00