Commit Graph

125 Commits

Author SHA1 Message Date
53d2aaa4e3 DI: DbManager 2019-10-21 16:50:20 +03:00
e82366a2cd DI: dbManager 2019-10-21 15:33:02 +03:00
09881619b8 DI: DbManager 2019-10-18 16:29:24 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
5ec41ccaff DI: removed appSettings 2019-10-14 11:23:45 +03:00
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +03:00
f0e7e2e41b DI: notify 2019-10-11 11:31:21 +03:00
85fe70087e DI: CoreConfiguration 2019-10-10 16:18:12 +03:00
75285dfc69 DI: configuration 2019-10-10 13:59:22 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
515f7de555 DI: Configuration 2019-10-09 18:04:46 +03:00
080a343eb5 DI: AppSettings 2019-10-09 13:09:54 +03:00
387ce4e9ad DI: configuration 2019-09-27 14:51:09 +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
Daniil Senkiv
c0dc7125ea Web.Core: CommonLinkUtility: fixed generating confirm link 2019-09-27 11:58:10 +03:00
84ba343460 Auth: added check confirm method 2019-09-26 16:36:53 +03:00
Daniil Senkiv
95a369a091 Web.Core: revert d511e14e8e 2019-09-26 14:59:18 +03:00
94ab6c96aa Notify: check guest 2019-09-26 14:54:53 +03:00
22e4d19458 PasswordChange: added userId 2019-09-26 12:15:01 +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
f247b4a303 Notify: fixed resources 2019-09-24 19:21:05 +03:00
afb1f90e9a .net core up to 3.0.0 2019-09-24 14:20:58 +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
859bda608b Settings: added get cultures method 2019-09-23 16:19:01 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
8184492a4f DI: ConfigurationManager 2019-09-20 18:08:45 +03:00
181e570ce1 DI: CommonServiceProvider 2019-09-20 16:06:10 +03:00
41b4a909cd DI: TenantManager 2019-09-20 15:47:00 +03:00
7bb42748b7 DI TenantManager 2019-09-20 15:20:03 +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
Daniil Senkiv
d511e14e8e Web.Core: CommonLinkUtility: fixed generating link for creating user through invitation link 2019-09-20 10:58:07 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
409da28d4b DI: SubscriptionManager 2019-09-19 16:43:28 +03:00
7ceb117690 DI: CoreConfiguration 2019-09-19 14:34:54 +03:00
a07cbe30f4 DI: CoreSettings 2019-09-18 18:19:30 +03:00
4489d01b82 DI: PaymentManager, AuthorizationManager 2019-09-18 17:18:44 +03:00
2f5fe4301e DI: TenantManager 2019-09-18 15:14:15 +03:00
c171e2c903 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	common/ASC.IPSecurity/ASC.IPSecurity.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	common/ASC.VoipService/ASC.VoipService.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/ASC.Web.Core.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
152c5d9697 .net core up to 3.0.0-rc1 2019-09-18 12:29:17 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +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
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
f4d4de3cec People: fixed remove photo 2019-09-13 16:19:47 +03:00
bf86c4e4ef People: fixed remove photo 2019-09-13 16:15:51 +03:00