|
6df790280b
|
web: People: ProfileAction: added departments field
|
2019-08-21 16:39:32 +03:00 |
|
|
c9be143015
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-21 14:15:06 +03:00 |
|
|
da13d9f650
|
web: People: ProfileAction: fix form validation
|
2019-08-21 14:14:59 +03:00 |
|
|
5eda1cb8c0
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-21 14:14:28 +03:00 |
|
|
4c73b14d69
|
web: People: Re-written updateUserStatus with new action setUser;
Moved resetFilter to actions;
|
2019-08-21 14:14:18 +03:00 |
|
|
098f2f0669
|
web: People: ProfileAction: merge form files
|
2019-08-21 14:07:13 +03:00 |
|
|
78ebffd910
|
web: People: added create/update profile actions to store
|
2019-08-21 13:56:03 +03:00 |
|
|
a357935725
|
web: People: fix ProfileAction fields
|
2019-08-21 11:22:44 +03:00 |
|
|
d5410def67
|
web: People: ProfileAction: using DateInput in ReduxForm fixed
|
2019-08-20 18:22:33 +03:00 |
|
|
e2ed5a88e8
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/Form/userForm.js
|
2019-08-20 17:48:13 +03:00 |
|
|
a25bf70fa8
|
web: People: styled ProfileAction
|
2019-08-20 17:45:10 +03:00 |
|
|
4db40b548d
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-20 16:48:52 +03:00 |
|
|
84e35f90ef
|
web: People: Added group selector in Filter
|
2019-08-20 16:28:26 +03:00 |
|
Ilya Oleshko
|
0d53d45b46
|
web: People: Redesigned mapping of users to Row and RowContent components.
|
2019-08-20 16:08:59 +03:00 |
|
Daniil Senkiv
|
bdb166bc25
|
Web/People: fixed translation function
|
2019-08-20 12:34:16 +03:00 |
|
|
b53b79b8f9
|
Updated yarn.lock files
|
2019-08-20 10:23:15 +03:00 |
|
|
9967c04b7c
|
web: People: Added enable/disable user by context menu
|
2019-08-19 16:59:37 +03:00 |
|
Daniil Senkiv
|
ac6ce19963
|
People: Client: fixed labels of filter
|
2019-08-19 15:27:44 +03:00 |
|
Daniil Senkiv
|
14b9104705
|
Web: People: Profile/Section/Body: translated existing words in current version [EN]
|
2019-08-19 14:21:47 +03:00 |
|
Daniil Senkiv
|
d7fce7998e
|
Web: People: translated existing words in current version, Home [EN]
|
2019-08-19 14:20:43 +03:00 |
|
|
cc2ea5f5eb
|
Fixed yarn.lock files
|
2019-08-19 14:13:09 +03:00 |
|
|
225e01df23
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-19 13:30:28 +03:00 |
|
|
79178a0edc
|
Changed folder for asc-web-components (npm-local/ -> packages/); Added react-calendar v2.13.2 (with important fix)
|
2019-08-19 13:30:18 +03:00 |
|
Ilya Oleshko
|
0ad354b05f
|
web: Components: Fixed structure of PeopleRow component on Row.People
|
2019-08-19 10:13:26 +03:00 |
|
|
9aa41e2039
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-19 09:03:35 +03:00 |
|
|
458393d187
|
web: People: Changed loading init user info to async function
|
2019-08-16 17:57:28 +03:00 |
|
|
b14b178223
|
web: People: Moved handler to separated const
|
2019-08-16 17:36:44 +03:00 |
|
|
5fab8c84a2
|
web: People: Refactoring: Removed useless comment
|
2019-08-16 17:35:39 +03:00 |
|
Ilya Oleshko
|
b757ee5217
|
web: People: Redesigned mapping of users to PeopleRow component. Fixed row height for scroll.
|
2019-08-16 16:37:47 +03:00 |
|
Daniil Senkiv
|
fa8f00d17a
|
Web: People: translated existing words in current version, Filter [EN]
|
2019-08-16 16:23:35 +03:00 |
|
Daniil Senkiv
|
4fa64cff70
|
Web: People: translated existing words in current version, userForm [EN]
|
2019-08-16 15:32:17 +03:00 |
|
|
35028de860
|
web: People: styled ProfileAction
|
2019-08-16 13:39:06 +03:00 |
|
|
36009e6d32
|
web: People: styled ProfileAction
|
2019-08-16 13:34:36 +03:00 |
|
|
14f7ffdfdf
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-16 13:26:57 +03:00 |
|
|
5dd8b1bd39
|
web: People: styled ProfileAction
|
2019-08-16 13:25:52 +03:00 |
|
Ilya Oleshko
|
74eb7a141f
|
web: People: Fixed displaying checkbox at row for users
|
2019-08-16 10:44:23 +03:00 |
|
Daniil Senkiv
|
fff4269767
|
Web: People: translated existing words in current version, Body [EN]
|
2019-08-15 19:17:51 +03:00 |
|
|
e11a3d0b08
|
People: fixed count
|
2019-08-15 18:54:56 +03:00 |
|
Daniil Senkiv
|
848ec61fa6
|
Web: People: translated existing words in current version, MainButton [EN]
|
2019-08-15 18:52:35 +03:00 |
|
Daniil Senkiv
|
980a132917
|
Web: People: translated existing words in current version, Header [EN]
|
2019-08-15 18:51:08 +03:00 |
|
Daniil Senkiv
|
b6f83d8d7c
|
Web: People: translated existing words in current version, Paging [EN]
|
2019-08-15 18:49:25 +03:00 |
|
|
9e32ad4b6c
|
IDE0063
|
2019-08-15 18:08:40 +03:00 |
|
|
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 |
|
|
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 property s
|
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 |
|