Commit Graph

49 Commits

Author SHA1 Message Date
6c28b6777d added DarkThemeSettings 2022-04-20 17:19:06 +03:00
6233ab55a3 Personal: added register method 2021-09-17 17:32:37 +03:00
6d2f417c5c Method GetAuthProviders moved to PeopleController 2021-04-25 11:46:44 +03:00
741c3a17ab People: Added thirdparty/signup method 2021-04-15 14:34:22 +03:00
57ba1d7cc5 People: model. Added FromInviteLink 2020-12-22 17:19:58 +03:00
68483bc979 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Startup.cs
2020-11-13 16:03:17 +03:00
SuhorukovAnton
9039c810c5 x-www-form-urlencoded: fix 2020-11-11 18:36:58 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
d883ef441f Api: moved from release/11 4414f77b 2020-09-17 15:04:28 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +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
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
a90b1fb424 People: added GetExpression 2020-02-25 11:02:13 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
2758fb1dfb Merge branch 'master' into feature/ef 2019-12-12 17:53:54 +03:00
NikolayRechkin
94581bdd39 People: deleted unused code 2019-12-09 15:59:34 +03:00
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
538511a4dc EF: options 2019-11-25 14:49:21 +03:00
3586867429 EF: DbUserService 2019-11-25 12:49:12 +03:00
26c8d56219 DI: refactoring. Added EmployeeWraperHelper 2019-11-11 18:42:07 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
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
d3b208b6a5 Web: People: Implemented opportunity to change culture in Profile 2019-09-29 13:50:18 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
df9b6efa92 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/GroupController.cs
2019-09-20 14:27:03 +03:00
85cfe85252 People: added group model 2019-09-20 13:43:13 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
f34dca4ebb DI: ApiDateTime 2019-09-17 18:38:06 +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
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