|
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 |
|
|
1afcd2442c
|
ConfirmAuthHandler: auth by uid
|
2019-09-27 12:18:48 +03:00 |
|
NikolayRechkin
|
46a02a8385
|
web: components: bump version
|
2019-09-27 12:02:19 +03:00 |
|
NikolayRechkin
|
c91a2aeeb1
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-27 12:02:09 +03:00 |
|
NikolayRechkin
|
48090e6fdf
|
web: components: fixed story for avatar editor
|
2019-09-27 12:01:46 +03:00 |
|
Daniil Senkiv
|
f26867854b
|
Web.Client: revert routing (6804a3ab6b )
|
2019-09-27 12:00:29 +03:00 |
|
Daniil Senkiv
|
c0dc7125ea
|
Web.Core: CommonLinkUtility: fixed generating confirm link
|
2019-09-27 11:58:10 +03:00 |
|
NikolayRechkin
|
1d8e175089
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-27 11:52:26 +03:00 |
|
NikolayRechkin
|
9a2a659430
|
web: people: fixed create user
|
2019-09-27 11:52:17 +03:00 |
|
|
30f9612eec
|
web: People: Fixed paging by filter url
|
2019-09-27 10:06:47 +03:00 |
|
|
74c5873c5d
|
web: People: Changed DEFAULT_EMPLOYEE_STATUS to Active
|
2019-09-27 10:06:12 +03:00 |
|
Ilya Oleshko
|
4ff81ac474
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-27 08:57:49 +03:00 |
|
|
925a584b63
|
web: People: Added loading filter by url on first loading
|
2019-09-26 17:01:21 +03:00 |
|
|
34e3f72475
|
web: Client: Fixed dummy bug
|
2019-09-26 16:57:38 +03:00 |
|
|
d679b91ecc
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-26 16:37:10 +03:00 |
|
|
84ba343460
|
Auth: added check confirm method
|
2019-09-26 16:36:53 +03:00 |
|
Ilya Oleshko
|
c29a18dba6
|
web: People: Fixed fields at profile viewer.
|
2019-09-26 16:36:47 +03:00 |
|
|
50ff61e6f1
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-26 16:36:46 +03:00 |
|
|
9ba5348863
|
web: People: Moved setup of filter url to people/actions.js
|
2019-09-26 16:36:33 +03:00 |
|
Ilya Oleshko
|
fb88adaa5c
|
web: People: Fixed ComboBox property at profile actions.
|
2019-09-26 16:35:02 +03:00 |
|
NikolayRechkin
|
11ff1f69ba
|
web: components: bump version
|
2019-09-26 16:31:08 +03:00 |
|
NikolayRechkin
|
64e5b07aa4
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-26 16:28:01 +03:00 |
|
NikolayRechkin
|
380548112f
|
web: components: added displayType property to avatar editor
|
2019-09-26 16:27:42 +03:00 |
|
NikolayRechkin
|
393341a861
|
web: components: added new parameters to Aside component
|
2019-09-26 16:09:50 +03:00 |
|
|
586ee3b2f7
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
|
2019-09-26 15:45:30 +03:00 |
|
|
c8b909b156
|
web: People: Filter Section re-written to class with setup of url by filter
|
2019-09-26 15:43:21 +03:00 |
|
Daniil Senkiv
|
6804a3ab6b
|
Web.Client: changed routing, fixed changeEmail state
|
2019-09-26 15:00:23 +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 |
|
|
647a7fb2d4
|
Kafka: fixed onmessage error
|
2019-09-26 14:53:54 +03:00 |
|
|
20a9d01dd4
|
Web: Client fix password field
|
2019-09-26 13:12:53 +03:00 |
|
|
a8d4cabdaa
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
# web/ASC.Web.Client/src/store/services/api.js
|
2019-09-26 13:10:23 +03:00 |
|
Daniil Senkiv
|
fd08ae9039
|
Web.Client: Confirm: added changeEmail sub-component
|
2019-09-26 12:45:10 +03:00 |
|
|
7fe7138d50
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-26 12:23:04 +03:00 |
|
|
e7391d01d1
|
Web: Client: added translations, fixed changePassword api
|
2019-09-26 12:22:56 +03:00 |
|
|
22e4d19458
|
PasswordChange: added userId
|
2019-09-26 12:15:01 +03:00 |
|
Ilya Oleshko
|
7d1b6eb79e
|
web: components: bump version
|
2019-09-26 12:09:02 +03:00 |
|
Ilya Oleshko
|
606b35a858
|
web: Components: Fixed page ComboBox for Paging component
|
2019-09-26 12:08:39 +03:00 |
|
|
2034777701
|
added check permission for GeInviteLink
|
2019-09-26 11:36:49 +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 |
|
|
adc6dc801e
|
Notify: fixed textile
|
2019-09-25 17:25:28 +03:00 |
|
Daniil Senkiv
|
6840945d00
|
Web.Client: in addition to 6c3dc95c80
|
2019-09-25 16:44:47 +03:00 |
|
Daniil Senkiv
|
6c3dc95c80
|
Web.Client: renamed api method
|
2019-09-25 16:39:46 +03:00 |
|
|
2564a0c760
|
fixed start services
|
2019-09-25 15:55:35 +03:00 |
|
|
4aac6be6ab
|
fixed start services
|
2019-09-25 15:49:21 +03:00 |
|
NikolayRechkin
|
94040b74e8
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-25 14:14:23 +03:00 |
|
|
2c341d59b8
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-25 13:56:53 +03:00 |
|
|
cb68c873be
|
Web: Client: replaced component "TextInput" to "PasswordInput"
|
2019-09-25 13:56:31 +03:00 |
|