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
..
CommonApiResponse.cs	Replaced NewtonsoftJson with System.Text.Json	2020-02-21 16:19:32 +03:00
CultureMiddleware.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
DisposeMiddleware.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
IpSecurityFilter.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
PaymentFilter.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
ProductSecurityFilter.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
ResponseWrapper.cs	Api: added CustomJsonOptionsWrapper. optimization	2019-09-03 12:31:15 +03:00
TenantStatusFilter.cs	Added DIHelper	2020-02-17 11:58:14 +03:00