Commit Graph

86 Commits

Author SHA1 Message Date
4bad85defe moved from hotfix/10.5.2 2020-01-17 16:58:26 +03:00
48e56d462a Api: people. Fixed "Sequence contains no elements" error while saving empty contacts list 2019-12-27 13:19:35 +03:00
aea429a0ad Api: people. Fixed saving contacts 2019-12-25 18:16:29 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +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
a047332f9c Merge branch 'master' into feature/ef 2019-12-04 13:42:31 +03:00
ea60dbe63f DI: AccountLinker 2019-12-04 13:39:18 +03:00
997cfa5fda EF: Updated Dependencies. Optimized logging and userPhotoManager 2019-11-29 12:22:20 +03:00
3586867429 EF: DbUserService 2019-11-25 12:49:12 +03:00
d05565107c EF: init commit 2019-11-15 18:04:05 +03:00
074b8b7f61 People: optimized get all people method 2019-11-12 15:24:59 +03:00
26c8d56219 DI: refactoring. Added EmployeeWraperHelper 2019-11-11 18:42:07 +03:00
e9b6976187 Renamed all "*factory" classes to "*Extension" 2019-11-11 14:50:46 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
a35a457f6e DI: refactoring. Web.Api 2019-10-31 16:54:43 +03:00
402c4d908d DI: refactoring 2019-10-31 14:28:30 +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
78584b78a3 DI: removed LogManager 2019-10-22 14:21:44 +03:00
e0b5661188 DI: dbManager 2019-10-21 15:52:16 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
515f7de555 DI: Configuration 2019-10-09 18:04:46 +03:00
Daniil Senkiv
2ed3ee4905 Web.Client/Core: added method of deleting self profile 2019-10-04 07:58:38 +03:00
d3b208b6a5 Web: People: Implemented opportunity to change culture in Profile 2019-09-29 13:50:18 +03:00
d8fb67f683 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/AuthenticationController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Utility/CommonLinkUtility.cs
2019-09-27 13:45:37 +03:00
48b2726d78 Confirm: added uid to activation link 2019-09-27 12:20:10 +03:00
710a3f62fa Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
NikolayRechkin
7bcf2a6bf8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 09:04:30 +03:00
NikolayRechkin
1a98489513 People: changed photo upload function 2019-09-24 17:07:24 +03:00
6d815608a0 ConfirmAuth: PasswordChange 2019-09-24 15:27:13 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
00849598f0 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/GroupController.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-23 19:27:36 +03:00
23c00b458b Auth: added additional roles 2019-09-23 18:36:22 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +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
a6c8ad75f0 People: check date 2019-09-20 14:07:57 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
a07cbe30f4 DI: CoreSettings 2019-09-18 18:19:30 +03:00
f34dca4ebb DI: ApiDateTime 2019-09-17 18:38:06 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
547e589420 Removed TenantProvider 2019-09-16 17:51:39 +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
81394a6f1e revert 431fb76773 2019-09-16 12:24:06 +03:00
86c5e64b20 added AuthByClaim 2019-09-16 12:21:10 +03:00
98daea7115 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
2019-09-13 17:47:23 +03:00
bdb5b05748 ASC.People: ProfileAction: sending email change instructions 2019-09-13 17:45:22 +03:00