pavelbannov 0bbc383266 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs		2019-10-30 11:45:55 +03:00
..
AzRecordCache.proto	fixed AzRecordCache.proto	2019-10-29 15:26:23 +03:00
ConsumerCacheItem.proto	DI: BaseSettings	2019-09-13 14:18:27 +03:00
GroupCacheItem.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
NotifyMessage.proto	Added ASC.Studio.Notify service	2019-08-01 11:47:15 +03:00
QuotaCacheItem.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
SettingsCacheItem.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
SubscriptionMethodCache.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
SubscriptionRecord.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
TariffCacheItem.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
TenantCacheItem.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
TenantSetting.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
UserGroupRefCacheItem.proto	Kafka: guid as bytes	2019-08-28 15:58:53 +03:00
UserInfoCacheItem.proto	Kafka: guid as bytes	2019-08-28 15:58:53 +03:00
UserPhotoCacheItem.proto	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00