pavelbannov 3a747ef8e4 Merge branch 'master' into feature/system-json ... # Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Api.Core/Core/ApiDateTime.cs # common/ASC.Api.Core/Model/EmployeeWraper.cs # common/ASC.Api.Core/Model/EmployeeWraperFull.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.People/Server/Models/GroupWrapperFull.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Models/BuildVersion.cs		2020-05-07 10:28:20 +03:00
..
AzRecord.cs	IDE0019, IDE0020	2019-08-15 16:41:38 +03:00
DBResourceManager.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
EmployeeActivationStatus.cs	init commit	2019-05-15 17:56:09 +03:00
EmployeeStatus.cs	init commit	2019-05-15 17:56:09 +03:00
EmployeeType.cs	init commit	2019-05-15 17:56:09 +03:00
Group.cs	IDE0019, IDE0020	2019-08-15 16:41:38 +03:00
GroupInfo.cs	IDE0019, IDE0020	2019-08-15 16:41:38 +03:00
IAzService.cs	init commit	2019-05-15 17:56:09 +03:00
IncludeType.cs	init commit	2019-05-15 17:56:09 +03:00
IQuotaService.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
ISubscriptionService.cs	init commit	2019-05-15 17:56:09 +03:00
ITenantService.cs	DI: configuration	2019-10-10 13:59:22 +03:00
IUserService.cs	People: added GetExpression	2020-02-25 11:02:13 +03:00
Partner.cs	IDE0019, IDE0020	2019-08-15 16:41:38 +03:00
PartnerDisplayType.cs	init commit	2019-05-15 17:56:09 +03:00
PartnerPaymentMethod.cs	init commit	2019-05-15 17:56:09 +03:00
PartnerStatus.cs	init commit	2019-05-15 17:56:09 +03:00
PartnerType.cs	init commit	2019-05-15 17:56:09 +03:00
SubscriptionMethod.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
UserGroupRef.cs	Kafka: guid as bytes	2019-08-28 15:58:53 +03:00
UserGroupRefDictionary.cs	init commit	2019-05-15 17:56:09 +03:00
UserGroupRefType.cs	init commit	2019-05-15 17:56:09 +03:00
UserInfo.cs	EF: DbUserService	2019-11-25 12:49:12 +03:00