Commit Graph

15 Commits

Author SHA1 Message Date
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
NikolayRechkin
25ae6b8b05 web: People: creating a user avatar 2019-09-13 14:41:15 +03:00
deb8231f26 revert f85711b736 2019-09-12 14:34:58 +03:00
1530ec842e DI: WebImageSupplier,WebItemSettings, SettingsManager 2019-09-11 13:42:52 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
967068a728 UserInfo: optimization 2019-09-02 18:09:45 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
a26a6db0ea Api: added settings controller 2019-08-12 13:53:12 +03:00
49b259abff refactoring 2019-08-09 15:28:19 +03:00
f85711b736 Optimization 2019-08-08 12:26:58 +03:00
c6a4bad14d People: fix default avatar's urls 2019-08-05 16:08:27 +03:00
663093b7e5 People: cache default photo 2019-07-24 15:34:23 +03:00
Ilya Oleshko
fd5edef6bc People: Added return parameter avatarMax 2019-07-24 14:27:32 +03:00
d045346b73 People: api. Added UploadMemberPhoto method 2019-07-17 11:55:08 +03:00
2458bc2944 ASC.People project is divided into two separate parts: Server and Client 2019-07-10 11:21:12 +03:00