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
..
protos	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
ASC.IPSecurity.csproj	updated dependecies	2020-02-21 11:13:01 +03:00
IPAddressRange.cs	Added ASC.Feed, ASC.IPSecurity	2019-06-14 19:14:24 +03:00
IPRestriction.cs	Added ASC.Feed, ASC.IPSecurity	2019-06-14 19:14:24 +03:00
IPRestrictionsRepository.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
IPRestrictionsService.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
IpRestrictionsSettings.cs	ISettings replaced with ISettingsExt	2019-11-08 18:11:30 +03:00
IPSecurity.cs	Removed unused dependencies	2020-02-20 17:57:48 +03:00
IPSecurityException.cs	Added ASC.Feed, ASC.IPSecurity	2019-06-14 19:14:24 +03:00