Commit Graph

408 Commits

Author SHA1 Message Date
93ae8acba9 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 14:54:26 +03:00
Ilya Oleshko
5765554125 web: People: Profile: Fixed departments link type and isSelf option 2019-08-15 14:53:49 +03:00
2ac4246122 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 14:53:17 +03:00
65563552fa Packages updated 2019-08-15 14:33:57 +03:00
6a1220efe2 web: People: Added styled-components 2019-08-15 13:30:55 +03:00
697af9ca32 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 12:11:11 +03:00
Ilya Oleshko
0045a52a6a web: People: Profile: Fixed context options mapping 2019-08-15 11:16:19 +03:00
427b880f3b web: People: Refactoring: Moved function 2019-08-15 10:50:54 +03:00
d4d0cd687d web: People: Refactoring: Removed useless imports; 2019-08-15 10:50:31 +03:00
Ilya Oleshko
9486d11f56 web: People: Profile: Moved back to PageLayout 2019-08-15 10:21:04 +03:00
4e70bd627f Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-14 17:52:12 +03:00
1ecb618bfb web: people: Added restricted prop to PrivateRoute (to prevent direct movement to Admin's functional) 2019-08-14 17:52:03 +03:00
Ilya Oleshko
e3fd281af4 web: People: Fixed paging options. Fixed totalPages checking. 2019-08-14 17:24:41 +03:00
3c436e5b65 web: People: Hidden edit profile for User viewer 2019-08-14 16:56:35 +03:00
Ilya Oleshko
d440e0d3ed web: People: Fixed defaultPageItem and defaultCountItem paging options. Fixed totalPages rounding. 2019-08-14 15:56:30 +03:00
3028f4ef33 web: People: Hidden "filter-status" for User viewer 2019-08-14 15:44:15 +03:00
861febbe0f web: People: Added reset empty filter handler 2019-08-14 14:33:56 +03:00
95cb4dc503 web: People: Setup context menu for users in list 2019-08-14 10:29:22 +03:00
783c2c3593 web: People: Commented lazy loading 2019-08-14 09:26:16 +03:00
e63901c754 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-13 17:48:17 +03:00
6e71569c12 web: People: Init translation 2019-08-13 17:48:04 +03:00
a9ce68847f web: client: Init translation 2019-08-13 17:47:40 +03:00
d70375a52e web: People: Removed isHovered 2019-08-13 17:45:13 +03:00
d7376418f8 Removed unused resources 2019-08-13 16:05:36 +03:00
7a99918c29 web: components: Added CustomScrollbarsVirtualList for FixedSizeList in react-window package 2019-08-13 15:04:56 +03:00
dc33d6566c web: People: Added setup defaultSelectedKeys for TreeMenu 2019-08-13 12:32:30 +03:00
f107416e66 web: People: Moved getTreeGroups back to PeopleTreeMenu 2019-08-12 18:01:44 +03:00
d6ca19d216 web: People: Simplified People TreeMenu; Added selection of group with changing header; 2019-08-12 17:56:29 +03:00
b675e8108d Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-12 16:01:35 +03:00
17805a596c web: People: Added loading settings from api 2019-08-12 16:01:26 +03:00
731ddefc82 Added CultureMiddleware and DisposeMiddleware 2019-08-12 15:52:55 +03:00
Ilya Oleshko
1f15d582e8 web: People: Added paging option placeholders 2019-08-12 14:13:31 +03:00
a26a6db0ea Api: added settings controller 2019-08-12 13:53:12 +03:00
7a0c416400 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	web/ASC.Web.Components/src/index.js
2019-08-09 17:59:55 +03:00
da510a0b4b web: People: Added EmptyScreenContainer for empty filter results 2019-08-09 17:57:24 +03:00
49b259abff refactoring 2019-08-09 15:28:19 +03:00
236c59e1bf web: People: Implemented page changing in People paging 2019-08-09 11:20:32 +03:00
4d9db01c58 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-08 17:43:10 +03:00
f0d2854071 People: fix search by filter 2019-08-08 17:42:29 +03:00
483238d118 web: People: Removed useless prop 2019-08-08 17:25:47 +03:00
97f84f2e86 web: People: Fixed Filter sorting by 2019-08-08 17:25:22 +03:00
24bffb801e web: People: Added default props for Home SectionBodyContent 2019-08-08 15:49:18 +03:00
e2389c9001 web: People: Applied Filter changes 2019-08-08 15:47:43 +03:00
0db1734ebc web: People: Changed icon 2019-08-08 15:47:00 +03:00
f716d34821 web: People: Styled group form + added fake selected-items 2019-08-08 14:08:56 +03:00
019c5d0a22 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-08 12:50:56 +03:00
eb42a4d6d5 web: People: Styled group form 2019-08-08 12:50:48 +03:00
f85711b736 Optimization 2019-08-08 12:26:58 +03:00
f79647833b web: People: Added NotImplemented click handler 2019-08-07 17:31:54 +03:00
71b8c66cb9 web: People: Init GroupAction page 2019-08-07 17:03:17 +03:00
Ilya Oleshko
071cf994f0 web: People: Renamed getContacts to getUserContacts selector 2019-08-07 14:30:47 +03:00
3c1d5f9047 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-07 13:58:09 +03:00
b0d5d1ea72 web: People: Optimization of People list rendering
Added new packages: react-window and react-virtualized-auto-sizer;
Added changes to Scrollbar, PageLayout and PageSection
2019-08-07 13:57:54 +03:00
Alexey Kostenko
4e2239d4fd web: components: Text: Color property is now custom 2019-08-07 11:18:42 +03:00
Alexey Kostenko
04ff759147 web: components: Text: Fix 2019-08-06 17:31:52 +03:00
ba1ab61182 web: People: Refactoring: Renamed isSelected selector 2019-08-06 14:08:29 +03:00
55b72f6026 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-06 14:02:52 +03:00
1e6732a929 web: People: Added new EmployeeStatus and EmployeeActivationStatus enums 2019-08-06 14:02:36 +03:00
Ilya Oleshko
8e8812ce1f web: People: Fixed getContacts selector 2019-08-06 13:38:43 +03:00
217b5f0bed web: People: Added isUserDisabled selector 2019-08-06 12:44:32 +03:00
Ilya Oleshko
c229857e4c Web: People: Profile: Fixed context options usage. 2019-08-06 11:33:38 +03:00
Ilya Oleshko
cdadaa19fd Web: People: Profile: Commented out unused blocks "Affiliate status" and "Login settings" 2019-08-06 11:05:49 +03:00
Ilya Oleshko
5062846691 Web: People: Added icons in MainButton 2019-08-06 10:55:47 +03:00
f090c73045 web: People: Added handler onCancel 2019-08-06 09:08:48 +03:00
4da674ab75 web: People: Added people.svg 2019-08-05 18:24:34 +03:00
a2288468ff Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-05 18:13:12 +03:00
e9a0aed7b0 web: People: Applied selectedOption in paging 2019-08-05 18:12:54 +03:00
e9c564fda9 People: method "get by filter" optimized 2019-08-05 16:45:33 +03:00
5495db7103 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-05 16:21:22 +03:00
c6a4bad14d People: fix default avatar's urls 2019-08-05 16:08:27 +03:00
Ilya Oleshko
04d139210d Web: People: Fixed names of paging propertys, added selectedPage and selectedCount propertys 2019-08-05 16:05:41 +03:00
56e4ed664c Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-05 15:44:57 +03:00
9c2bb562f9 web: components: UserContent optimization 2019-08-05 15:44:45 +03:00
90cce27191 web: People: Changed avatarName 2019-08-05 15:43:18 +03:00
1fd62e757c Api: RegisterForDispose DisposableHttpContext 2019-08-05 15:37:33 +03:00
c081d1b117 web: People: Refactoring: Changed import 2019-08-05 14:39:50 +03:00
347e2ac475 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-05 14:25:40 +03:00
571c0ad921 web: People: Refactoring: Added folder store/services; Moved api and other utils 2019-08-05 14:25:30 +03:00
Ilya Oleshko
7e6edd5214 Web: People: Profile: Fixed empty contacts and culture issue 2019-08-05 13:43:38 +03:00
Ilya Oleshko
70bede9bb0 Web: People: Profile: Render optimization 2019-08-05 13:22:20 +03:00
91f4ecbcb3 web: People: Fixed Owner display pending icon 2019-08-05 12:22:32 +03:00
8a4807daaa Api: fix 2019-08-05 10:50:11 +03:00
1de8fd7398 Api: fields 2019-08-02 17:40:33 +03:00
093f22b2f1 web: People: Fixed set total for none empty filter 2019-08-02 16:47:07 +03:00
a40dc1917f web: People: Extended Filter clone 2019-08-02 16:45:36 +03:00
a3eddca8f8 web: People: Fixed ActivationStatus filtering 2019-08-02 16:04:25 +03:00
8511c8b50d web: People: Implemented base filtration 2019-08-02 15:48:33 +03:00
Daniil Senkiv
dc0bfa5695 People/Client: update yarn.lock 2019-08-02 13:53:53 +03:00
5e9c18487c web: People: Added toastr call for User's ContextMenu 2019-08-02 13:36:46 +03:00
65909f342a web: People: Added commented fields for Filter 2019-08-02 13:33:30 +03:00
a865d5d710 web: People: Applied Toast component 2019-08-02 13:31:52 +03:00
83b9fc4be0 web: People: Moved back to PageLayout 2019-08-02 12:43:16 +03:00
32d15e6947 web: People: Added request-loader 2019-08-02 10:37:40 +03:00
f0799aff07 web: People: Fixed uncheck checkbox in ContentRow 2019-08-02 09:25:14 +03:00
66cedeaf34 web: People: Removed useless import 2019-08-01 22:00:26 +03:00
5f1f347d20 web: components: SectionBodyContent optimization 2019-08-01 21:50:01 +03:00
b253a1156f web: components: PeopleLayout optimization 2019-08-01 21:39:14 +03:00
1cfc09dad9 web: People: ArticleMainButtonContent re-written to class component 2019-08-01 21:25:12 +03:00
46d1b8b1ab web: People: Removed useless code 2019-08-01 21:24:37 +03:00
Ilya Oleshko
ad66da3837 Web: People: Profile: Fixed empty contacts issue 2019-08-01 17:19:44 +03:00
Ilya Oleshko
b0e3e22b46 Web: People: Profile: SectionBodyContent optimization 2019-08-01 17:15:57 +03:00
f22e01bf27 web: People: Renamed selector 2019-08-01 15:45:18 +03:00
043ed9020c web: People: Home page SectionBodyContent optimization 2019-08-01 14:09:10 +03:00
d483934d86 web: People: SectionHeaderContent optimization 2019-08-01 14:04:00 +03:00
3036e1cb90 Added ASC.Studio.Notify service 2019-08-01 11:47:15 +03:00
Ilya Oleshko
210b1838ba Web: People: Profile: Moved styles to constants 2019-07-31 17:23:44 +03:00
4f99d66a26 web: People: Changed filter work 2019-07-30 17:00:56 +03:00
800e899e2a web: People: Added changing page size 2019-07-30 14:28:07 +03:00
Ilya Oleshko
e72ae63792 Web: People: Fixed usage of GroupButtonsMenu component 2019-07-30 14:18:09 +03:00
e6a3b4aa62 web: People: Fixed paging:
+ moved filtering state to people filter
+ removed useless separated paging and filter states
+ Extended Filter class
+ refactoring of function names
2019-07-30 12:06:50 +03:00
beaa9e8f42 web: People: Removed useless import 2019-07-29 16:53:35 +03:00
d7dd62e193 web: People: Renamed method 2019-07-29 16:53:05 +03:00
3007704ae7 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-07-29 15:28:10 +03:00
7f50c9e7e8 web: People: Added and applied common settings state 2019-07-29 15:28:00 +03:00
7dd4dd5a38 Api: added total 2019-07-29 13:51:14 +03:00
Ilya Oleshko
7be6531c97 Web: People: Profile: Fixed Link component usage 2019-07-29 11:33:08 +03:00
Ilya Oleshko
2cb882d1dc Web: People: Fixed user content layout 2019-07-29 11:28:24 +03:00
79a203e4a3 Fix: TypeError: console.log(...) is not a function 2019-07-28 23:49:43 +03:00
dced6d991b web: People: Moved converters to selectors 2019-07-28 23:45:41 +03:00
5be398ad02 web: People: Refactoring: moved duplicated logic to fetchProfile action 2019-07-28 20:47:33 +03:00
611a9b8632 web: People: Added selector for search profile in loaded people list 2019-07-28 20:30:46 +03:00
8174e47f14 web: People: Refactoring:
+ moved actions and reducers to store folder
+ added selectors
+ re-written Profile page to class component
2019-07-28 20:11:55 +03:00
bda538fc97 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	products/ASC.People/Client/src/actions/actionTypes.js
	products/ASC.People/Client/src/actions/peopleActions.js
	products/ASC.People/Client/src/reducers/people.js
2019-07-26 18:00:06 +03:00
df4c152739 web: People: Refactoring: Changed selection users with redux + Added Filter class 2019-07-26 17:54:42 +03:00
c9dbb6997c Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-26 14:38:39 +03:00
b1a8d574d8 People: api. added userid parameter to UpdateMember method 2019-07-26 14:37:50 +03:00
Ilya Oleshko
3e10de6144 Web: People: Changed size of user status icons for people row 2019-07-26 14:16:33 +03:00
Ilya Oleshko
a9642a9846 Web: People: Fixed displaying of user status at row 2019-07-26 13:47:06 +03:00
3a657e0c64 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-26 11:16:37 +03:00
2f2f934a3f web: People: ProfileAction:
1) changed ProfileAction to class component
2) react hooks replaced with component state
3) fetching profile data from redux store
2019-07-26 11:09:07 +03:00
d8a526a693 web: People: ProfileAction: fixed header text 2019-07-26 11:05:36 +03:00
eaeb0d6bf5 web: People: ProfileAction: fixed userName avatar props in form 2019-07-26 11:04:58 +03:00
2cf946434c web: People: added redux actions to set target user 2019-07-26 11:03:39 +03:00
Ilya Oleshko
8db94c83d3 Web: People: Profile: Added text truncate for user contacts 2019-07-26 10:13:24 +03:00
Ilya Oleshko
f9e3b2980d Web: People: Profile: Added displayed information for @self profile view 2019-07-25 17:13:17 +03:00
Ilya Oleshko
96cb6d5841 Web: People: Profile: Added isAdmin and isSelf property`s 2019-07-25 17:11:37 +03:00
Ilya Oleshko
84c3e35254 Web: People: Profile: Added edit action from profile view 2019-07-25 15:25:01 +03:00
Ilya Oleshko
cd1e76cda0 Web: People: Profile: Added indication of email activation 2019-07-25 15:14:25 +03:00
Ilya Oleshko
abcca6a270 Web: People: Profile: Added LDAP user indication 2019-07-25 15:12:37 +03:00
Ilya Oleshko
b4f38b9581 Web: People: Profile: Fixed missing key error. Added formatting function for entering gender values. 2019-07-25 14:13:17 +03:00
Ilya Oleshko
180cb2e2ce Web: People: Profile: Fixed compression of back button when resizing.
Fixed header truncate.
2019-07-25 14:06:13 +03:00
7d0ea33245 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	products/ASC.People/Client/src/components/pages/Home/index.js
	web/ASC.Web.Components/src/components/content-row/index.js
2019-07-24 17:48:40 +03:00
8918e95b16 web: People: Rename handler and commented setState 2019-07-24 17:29:52 +03:00
9ad77d501f Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-24 17:24:56 +03:00
28e326bf16 web: test new page layout 2019-07-24 17:24:40 +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
ecc3bdfa8f Web: People: Fixed avatar size when viewing and editing user profile 2019-07-24 14:29:35 +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
b959a33b7f Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-24 10:26:21 +03:00
0ebe014548 web: People: ProfileAction: redux-form is broken into small components 2019-07-24 10:26:05 +03:00
dc8638f1c1 web: People: Moved history to Header 2019-07-23 19:23:11 +03:00
1027dac69c web: People: Added free dependencies 2019-07-23 19:17:02 +03:00
3a1a602f14 web: People: Fixed not a function error 2019-07-23 19:10:18 +03:00
8edbd71cf6 web: People: Added handler on Context menu Edit 2019-07-23 19:05:52 +03:00
85c4c65801 web: People: Added handler on MainButton Create->User/Guest actions 2019-07-23 19:00:19 +03:00
Ilya Oleshko
d2f0892bb6 Web: People: Profile: Added context options button.
Added groups links.
Added mailto action.
Fixed hiding fields if empty.
2019-07-23 17:44:45 +03:00
572ccfb893 web: People: Added displayName and fixed getUserStatus 2019-07-23 16:13:47 +03:00
f673795eb9 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-23 16:05:59 +03:00
803d0ec3ab web: People: ProfileAction: using redux-form 2019-07-23 16:01:29 +03:00
Ilya Oleshko
92f4c142d8 Web: People: Profile: Added profile viewer 2019-07-23 15:50:35 +03:00
caf0a25bf0 web: People: Changed SearchInput to FilterInput 2019-07-23 14:24:06 +03:00
4ff9290da3 web: People: Fixed row selection 2019-07-23 12:55:26 +03:00
f7c4ffa925 web: People: ProfileAction: getting user type from url parameter 2019-07-23 08:53:49 +03:00
3d49a3f9ae web: components: using ArrowPathIcon in SectionHeaderContent 2019-07-22 17:31:56 +03:00
86618cee9c web: People: ProfileAction 2019-07-22 17:22:44 +03:00
e41ca63bcf web: People: ProfileAction loader 2019-07-22 13:49:11 +03:00
0cae135973 web: People: Init get User info 2019-07-22 12:29:48 +03:00
cf0a009b74 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-07-22 11:57:54 +03:00
3290f5578e web: People: start ProfileAction 2019-07-22 11:57:47 +03:00
47ddf0460d web: People: Added opportunity to get User by userId on api.getUser 2019-07-22 11:36:31 +03:00
863ebdab9e web: People: Pass userId to props on routing (match.params.userId) 2019-07-22 11:35:13 +03:00
f7f857e04b web: People: Added opportunity to go to the '/products/people/view/{userName}' path from ContentRow UserName click 2019-07-22 11:33:47 +03:00
a8ece4d29c web: People: Init required props 2019-07-22 11:20:11 +03:00
9686d09086 web: People: Added opportunity to go to the '/products/people/view/@self' path from Profile menu 2019-07-22 10:56:08 +03:00
bde6206de4 web: People: Added check on isAdmin/isOwner for ContentRow render 2019-07-20 21:55:40 +03:00
b31d8a2f1a web: People: Added check on isAdmin/isOwner for MainButton render 2019-07-20 21:13:42 +03:00
418ea538d1 web: People: Added handler on Layout onLogoClick function 2019-07-20 21:00:51 +03:00
645946d7f1 web: People: Added Paging to new specific place in PageLayout Section 2019-07-20 20:31:26 +03:00
64d708f32c web: People: Added Filter to new specific place in PageLayout Section 2019-07-20 20:16:14 +03:00
a3df7f76b6 web: People: Changed string to Text.ContentHeader component 2019-07-20 19:53:33 +03:00
8a2e467fb1 web: People: Moved MainButton to new specific place in PageLayout Article 2019-07-20 19:50:58 +03:00
accf498b83 web: People: Removed useless import 2019-07-20 19:49:32 +03:00
1723027dea web: People: Fixed logout routing 2019-07-19 17:43:17 +03:00
6e500b0986 Upgrade .net core to 3.0.0-preview6
Added KafkaCache
2019-07-19 16:10:15 +03:00
31f253c210 web: People: Refactoring of routing 2019-07-19 14:41:54 +03:00
14eeec2bc7 web: People: Added new Profile and ProfileAction pages 2019-07-19 12:49:20 +03:00
0a837337f5 web: People: Removed fakeUsers 2019-07-19 12:20:55 +03:00
9e77012384 web: People: Added filter to getUserList api call 2019-07-19 12:07:22 +03:00
45978779db web: People: Fixed getGroupList api call 2019-07-19 12:03:20 +03:00
4703a70670 Api: fixed context 2019-07-19 11:38:31 +03:00
a97c057108 web: People: Added loading groups and users info into store and on the Home page 2019-07-18 22:29:10 +03:00
f475d23d8f web: People: Added changes to GroupButtonMenu render 2019-07-18 17:44:09 +03:00
Daniil Senkiv
1927efb32f Web.Client: update library for Toast component, in addition to (fa2f9332e6) 2019-07-18 17:40:34 +03:00
457e1d3306 web: People: refactoring SectionBodyContent 2019-07-17 17:39:28 +03:00
254b2104ef Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-07-17 16:55:20 +03:00
a7148cb793 npm install changed to yarn 2019-07-17 16:46:08 +03:00