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
..
Helpers	Consumers: added config	2019-12-20 14:17:01 +03:00
LoginProviders	Added DIHelper	2020-02-17 11:58:14 +03:00
Profile	Files: GoogleDriveApp	2020-02-03 16:31:42 +03:00
Properties	added ASC.VoipService	2019-06-06 17:41:16 +03:00
protos	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
AccountLinker.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
ASC.FederatedLogin.csproj	updated dependecies	2020-02-21 11:13:01 +03:00
callback.htm	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00
Login.cs	Consumers: added config	2019-12-20 14:17:01 +03:00
LoginMode.cs	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00
MultiRegionAccountLinker.cs	DI: AccountLinker	2019-12-04 13:39:18 +03:00
OAuth20Token.cs	IDE0018	2019-08-15 16:05:50 +03:00
ProviderConstants.cs	moved from hotfix/10.5.2	2020-01-21 16:40:01 +03:00