|
515f7de555
|
DI: Configuration
|
2019-10-09 18:04:46 +03:00 |
|
|
5e2823974e
|
DI: configuration
|
2019-09-27 18:12:13 +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 |
|
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 |
|
Ilya Oleshko
|
c29a18dba6
|
web: People: Fixed fields at profile viewer.
|
2019-09-26 16:36:47 +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 |
|
|
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
|
fd08ae9039
|
Web.Client: Confirm: added changeEmail sub-component
|
2019-09-26 12:45: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
|
206e4bedc1
|
web: people: added a default selection text for a filter
|
2019-09-25 13:51:40 +03:00 |
|
NikolayRechkin
|
65c0f21416
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-25 12:35:16 +03:00 |
|
NikolayRechkin
|
097b44b47f
|
web: people: added translations
|
2019-09-25 12:34:28 +03:00 |
|
|
5f0f148394
|
web: People: Change getSelectorUserList url to optimazed
|
2019-09-25 11:52:39 +03:00 |
|
|
d4cc3f0c78
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-25 10:48:07 +03:00 |
|
Daniil Senkiv
|
a6e7f5ab8d
|
People.Client: separated getting invite links
|
2019-09-25 10:43:14 +03:00 |
|
|
1e274cc63f
|
web: People: Added opportunity to delete group
|
2019-09-25 09:46:45 +03:00 |
|
|
17616763af
|
web: People: Added isDisabled for inputs with inLoading
|
2019-09-25 09:46:12 +03:00 |
|
|
396b08527f
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-25 09:13:11 +03:00 |
|
NikolayRechkin
|
7bcf2a6bf8
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-25 09:04:30 +03:00 |
|
NikolayRechkin
|
14f654d10c
|
web: people: new avatar editor
|
2019-09-24 17:17:10 +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 |
|
|
11fc9d2a01
|
web: People: Added fetchPeopleByFilter after save group
|
2019-09-24 15:27:06 +03:00 |
|
|
f6af4ed7e0
|
web: People: Refactoring: moved all inline functions; Renamed state props and methods;
Added onSelectedItemClose
|
2019-09-24 14:24:00 +03:00 |
|
|
dec4bb266e
|
DI: configuration
|
2019-09-24 13:32:12 +03:00 |
|
|
85abad1f94
|
web: People: Added condition for fetchSelectorUsers call
|
2019-09-24 11:01:02 +03:00 |
|
|
8ffe04e518
|
web: People: Fixed groupManager id set
|
2019-09-24 10:59:46 +03:00 |
|
|
4543a739e6
|
web: People: Added display selected groupManager
|
2019-09-24 10:02:08 +03:00 |
|
|
8ab67fffa7
|
web: People: Added resetGroup call after save group
|
2019-09-24 09:37:46 +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 |
|
|
ac924cd5b7
|
web: People: Fixed updateGroup
|
2019-09-23 17:44:50 +03:00 |
|
|
855fce1380
|
web: People: Added fetchSelectorUsers()
|
2019-09-23 17:44:27 +03:00 |
|
|
4ede6be2fc
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-23 17:31:11 +03:00 |
|
|
188fe16feb
|
web: People: Added fetchSelectorUsers()
|
2019-09-23 17:30:58 +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 |
|
|
48678ba02d
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-23 12:48:02 +03:00 |
|
|
a3b1846e41
|
web: People: Fixed Failed prop type: Invalid prop size of value base supplied to SearchIcon , expected one of ["small","medium","big","scale"].
|
2019-09-23 12:47:51 +03:00 |
|
Daniil Senkiv
|
5d5f923add
|
People.Client: Reassign: fixed warnings
|
2019-09-23 12:11:45 +03:00 |
|
|
a4b9be2438
|
web: People: Fixed Failed prop type: Invalid prop size of value base supplied to SearchIcon , expected one of ["small","medium","big","scale"].
|
2019-09-23 12:01:45 +03:00 |
|