pavelbannov 44ec45ebb6 Merge branch 'master' into feature/elastic ... # Conflicts: # common/ASC.Common/Security/Cryptography/InstanceCrypto.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Caching/CachedQuotaService.cs # common/ASC.Core.Common/Caching/CachedTenantService.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/AuthManager.cs # common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs # common/ASC.Core.Common/Context/Impl/TenantManager.cs # common/ASC.Core.Common/Context/SecurityContext.cs # common/ASC.Core.Common/Data/DbSettingsManager.cs # common/ASC.Core.Common/Tenants/TenantUtil.cs # common/ASC.Data.Reassigns/QueueWorker.cs # common/ASC.IPSecurity/IPSecurity.cs # common/services/ASC.Studio.Notify/Program.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Core/CookiesManager.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2020-02-25 11:24:45 +03:00
..
Model	Code Cleanup	2019-08-15 15:04:42 +03:00
appsettings.json	ResManager: DI fix	2020-01-23 14:03:38 +03:00
ASC.Resource.Manager.csproj	updated dependecies	2020-02-21 11:13:01 +03:00
EnabledSettings.cs	ASC.Resource.Manager: tool for export resources	2019-06-11 16:32:43 +03:00
JsonManager.cs	ResManager: DI fix	2020-01-23 14:03:38 +03:00
Options.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
Program.cs	ResManager: DI fix	2020-01-23 14:03:38 +03:00
ResourceData.cs	EF: resourceManager	2019-12-16 12:30:01 +03:00
ResxManager.cs	fix from review	2020-02-03 13:48:06 +03:00
Startup.cs	Added DIHelper	2020-02-17 11:58:14 +03:00