Commit Graph

266 Commits

Author SHA1 Message Date
5150f9e05c Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 17:01:20 +03:00
6bc2c24ad3 web: People: Back to PageLayout 2019-08-15 17:01:09 +03:00
9bee426464 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	products/ASC.People/Client/src/components/Layout.js
2019-08-15 16:52:56 +03:00
5dcbe56092 web: People: Decreased count of PeopleLayout render 2019-08-15 16:27:50 +03:00
Daniil Senkiv
937c1de58f Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 16:08:44 +03:00
Daniil Senkiv
edad39ed33 Web: People: translated Layout [EN] 2019-08-15 16:07:16 +03:00
58fb60ba65 IDE0007 2019-08-15 16:03:57 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
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