Commit Graph

22 Commits

Author SHA1 Message Date
bb6f32e36a Api: fix 2020-05-18 15:08:03 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
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
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
9d2862bf9e Renamed all "*factory" classes to "*Extension"
https://github.com/ONLYOFFICE/AppServer/pull/7#pullrequestreview-314756136
2019-11-11 12:03:49 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +03:00
de16476542 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2019-09-16 15:35:44 +03:00
86c5e64b20 added AuthByClaim 2019-09-16 12:21:10 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
a26d8d24ce Api: added CustomJsonOptionsWrapper. optimization 2019-09-03 12:31:15 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
49b259abff refactoring 2019-08-09 15:28:19 +03:00
f7327b0c79 Api: limit removed 2019-08-08 16:34:25 +03:00
f85711b736 Optimization 2019-08-08 12:26:58 +03:00
9e620d0ca1 Api: fix count 2019-07-30 16:36:08 +03:00
7dd4dd5a38 Api: added total 2019-07-29 13:51:14 +03:00
e9242435f5 Api: removed FormatIndexRoute. 2019-06-13 18:01:29 +03:00
fe44b9ff2c Api: added ApiContext 2019-06-13 12:04:46 +03:00