|
|
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 |
|
|
|
fb933d113a
|
People: fixed update group method
|
2019-09-23 15:46:42 +03:00 |
|
|
|
6de13b9d50
|
DI: configuration
|
2019-09-23 15:20:08 +03:00 |
|
|
|
3e0f946372
|
DI: PathUtils
|
2019-09-21 19:39:17 +03:00 |
|
|
|
1e946b19b6
|
DI: refactoring
|
2019-09-20 18:53:27 +03:00 |
|
|
|
8184492a4f
|
DI: ConfigurationManager
|
2019-09-20 18:08:45 +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 |
|
|
|
a6c8ad75f0
|
People: check date
|
2019-09-20 14:07:57 +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 |
|
|
|
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 |
|
|
|
6ab71a7b65
|
DI: tenantManager
|
2019-09-18 16:33:01 +03:00 |
|
|
|
bcdbcf5ccc
|
DI: TenantManager
|
2019-09-18 11:25:57 +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 |
|
|
|
431fb76773
|
PeopleController: removed CheckImgFormat
|
2019-09-13 16:33:01 +03:00 |
|
NikolayRechkin
|
25ae6b8b05
|
web: People: creating a user avatar
|
2019-09-13 14:41:15 +03:00 |
|
|
|
473207f9a4
|
DI: BaseSettings
|
2019-09-13 14:18:27 +03:00 |
|
|
|
deb8231f26
|
revert f85711b736
|
2019-09-12 14:34:58 +03:00 |
|
|
|
776516ec0a
|
DI: people
|
2019-09-12 10:57:59 +03:00 |
|
|
|
e0cb81adc4
|
Merge branch 'master' into refactoring/di
# Conflicts:
# products/ASC.People/Server/Controllers/PeopleController.cs
|
2019-09-11 21:21:21 +03:00 |
|
|
|
dd1cd3aee4
|
Api: added confirm auth scheme
|
2019-09-11 18:53:40 +03:00 |
|
|
|
1530ec842e
|
DI: WebImageSupplier,WebItemSettings, SettingsManager
|
2019-09-11 13:42:52 +03:00 |
|
|
|
c34db98d6b
|
suppress warning: NU1701 for release configuration
|
2019-09-10 18:20:17 +03:00 |
|
|
|
c50b5b0fc9
|
csproj: remove pdb file from release build configuration
|
2019-09-10 16:38:20 +03:00 |
|
|
|
7cd8e53d2c
|
Merge branch 'master' into refactoring/di
|
2019-09-10 16:15:15 +03:00 |
|
|
|
02efce033f
|
Api: added confirm auth scheme
|
2019-09-10 15:42:15 +03:00 |
|
|
|
31df2011bb
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-10 11:59:23 +03:00 |
|
|
|
3d01752e93
|
ASC.People: don't save empty user contacts
|
2019-09-10 11:53:47 +03:00 |
|
|
|
0a5ef37043
|
Getting STORAGE_ROOT from env variable
|
2019-09-09 18:04:28 +03:00 |
|
|
|
e2a4311a29
|
Dependency injection
Packages updated
|
2019-09-09 15:56:33 +03:00 |
|
|
|
238e103440
|
Optimization
|
2019-09-03 15:23:58 +03:00 |
|
|
|
b7e5a04137
|
People: fix delete route
|
2019-09-03 14:10:32 +03:00 |
|
|
|
a26d8d24ce
|
Api: added CustomJsonOptionsWrapper. optimization
|
2019-09-03 12:31:15 +03:00 |
|
|
|
967068a728
|
UserInfo: optimization
|
2019-09-02 18:09:45 +03:00 |
|
|
|
12747318c6
|
Optimization
|
2019-08-30 15:40:57 +03:00 |
|
|
|
d16d5f1251
|
Kafka: create only one producer for instance
UserPhotoManager: optimization
|
2019-08-27 17:57:06 +03:00 |
|
|
|
6cae722b9d
|
kafka disabled by default
|
2019-08-23 15:49:23 +03:00 |
|
|
|
e11a3d0b08
|
People: fixed count
|
2019-08-15 18:54:56 +03:00 |
|
|
|
9e32ad4b6c
|
IDE0063
|
2019-08-15 18:08:40 +03:00 |
|
|
|
58fb60ba65
|
IDE0007
|
2019-08-15 16:03:57 +03:00 |
|
|
|
f6d78d3cba
|
Code Cleanup
|
2019-08-15 15:04:42 +03:00 |
|
|
|
65563552fa
|
Packages updated
|
2019-08-15 14:33:57 +03:00 |
|
|
|
d7376418f8
|
Removed unused resources
|
2019-08-13 16:05:36 +03:00 |
|
|
|
731ddefc82
|
Added CultureMiddleware and DisposeMiddleware
|
2019-08-12 15:52:55 +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 |
|
|
|
f0d2854071
|
People: fix search by filter
|
2019-08-08 17:42:29 +03:00 |
|
|
|
f85711b736
|
Optimization
|
2019-08-08 12:26:58 +03:00 |
|
|
|
4da674ab75
|
web: People: Added people.svg
|
2019-08-05 18:24:34 +03:00 |
|
|
|
e9c564fda9
|
People: method "get by filter" optimized
|
2019-08-05 16:45:33 +03:00 |
|
|
|
c6a4bad14d
|
People: fix default avatar's urls
|
2019-08-05 16:08:27 +03:00 |
|
|
|
1fd62e757c
|
Api: RegisterForDispose DisposableHttpContext
|
2019-08-05 15:37:33 +03:00 |
|
|
|
8a4807daaa
|
Api: fix
|
2019-08-05 10:50:11 +03:00 |
|
|
|
1de8fd7398
|
Api: fields
|
2019-08-02 17:40:33 +03:00 |
|
|
|
3036e1cb90
|
Added ASC.Studio.Notify service
|
2019-08-01 11:47:15 +03:00 |
|
|
|
7dd4dd5a38
|
Api: added total
|
2019-07-29 13:51:14 +03:00 |
|
|
|
b1a8d574d8
|
People: api. added userid parameter to UpdateMember method
|
2019-07-26 14:37:50 +03:00 |
|
|
|
663093b7e5
|
People: cache default photo
|
2019-07-24 15:34:23 +03:00 |
|
|
|
969a605ad1
|
Upgrade references
|
2019-07-24 15:33:14 +03:00 |
|
Ilya Oleshko
|
fd5edef6bc
|
People: Added return parameter avatarMax
|
2019-07-24 14:27:32 +03:00 |
|
|
|
324ac1be9c
|
Added XmlOutputFormatter
|
2019-07-24 13:48:45 +03:00 |
|
|
|
9732fbb83a
|
People: fixed "status" method
|
2019-07-24 12:40:26 +03:00 |
|
|
|
1cbfa2fe71
|
People: fixed "@self" method
|
2019-07-24 12:28:39 +03:00 |
|
|
|
6e500b0986
|
Upgrade .net core to 3.0.0-preview6
Added KafkaCache
|
2019-07-19 16:10:15 +03:00 |
|
|
|
4703a70670
|
Api: fixed context
|
2019-07-19 11:38:31 +03:00 |
|
|
|
d045346b73
|
People: api. Added UploadMemberPhoto method
|
2019-07-17 11:55:08 +03:00 |
|
|
|
4f99bacb98
|
People.Server: removed pages
|
2019-07-12 17:31:15 +03:00 |
|
|
|
6c72b154e2
|
Server: added ForwardedHeaders
|
2019-07-12 17:28:14 +03:00 |
|
|
|
6b25d1e98c
|
People: fixed resources
|
2019-07-10 12:24:41 +03:00 |
|
|
|
2bb193b6b8
|
People: fixed resources
|
2019-07-10 11:51:24 +03:00 |
|
|
|
2458bc2944
|
ASC.People project is divided into two separate parts: Server and Client
|
2019-07-10 11:21:12 +03:00 |
|
