|
09535f8a30
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-02 09:24:26 +03:00 |
|
|
4b65925600
|
web: People: Implemented onChangeEmailClick
|
2019-08-30 18:15:52 +03:00 |
|
|
da37dbea6b
|
web: People: Implemented onDeleteProfileEverClick
|
2019-08-30 18:04:49 +03:00 |
|
|
d75af2980a
|
web: People: Moved buttons for Dialog to state
|
2019-08-30 17:55:17 +03:00 |
|
|
75431b5250
|
web: People: Implemented onDeleteProfileClick
|
2019-08-30 17:49:35 +03:00 |
|
Daniil Senkiv
|
431c7af595
|
People.Client: translated GroupAction component
|
2019-08-30 16:47:24 +03:00 |
|
Daniil Senkiv
|
d3444f0f87
|
People.Client: renamed translated key
|
2019-08-30 16:25:56 +03:00 |
|
|
eeebe87b97
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
|
2019-08-30 16:00:13 +03:00 |
|
|
12747318c6
|
Optimization
|
2019-08-30 15:40:57 +03:00 |
|
Daniil Senkiv
|
e7f38390c7
|
People.Client: translated Home component
|
2019-08-30 15:39:25 +03:00 |
|
Daniil Senkiv
|
22488cc872
|
People.Client: moved customNames.js
|
2019-08-30 15:38:53 +03:00 |
|
|
0b26057a54
|
web: People: Implemented onChangePasswordClick
|
2019-08-30 15:06:55 +03:00 |
|
|
e4a739c62a
|
web: People: ProfileAction: navigation changed
|
2019-08-30 14:47:13 +03:00 |
|
|
adadbe9fe3
|
web: People: Implemented onEmailSentClick
|
2019-08-30 14:35:23 +03:00 |
|
|
2589021fcf
|
web: People: Fixed display context menu options on self profile
|
2019-08-30 14:30:57 +03:00 |
|
|
7e24bb4e1c
|
web: People: Fixed comment
|
2019-08-30 14:29:19 +03:00 |
|
NikolayRechkin
|
d67dc7f61e
|
web: People: fix tree menu
|
2019-08-30 13:57:25 +03:00 |
|
|
f46637780a
|
web: People: ProfileAction: DepartmentField validation added
|
2019-08-30 13:17:34 +03:00 |
|
|
6c06d615ec
|
web: People: Profile: resetProfile returned
|
2019-08-30 13:15:49 +03:00 |
|
|
93566622a6
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-30 11:36:27 +03:00 |
|
|
6218363b52
|
web: People: Added change group tree by filter
|
2019-08-30 11:36:19 +03:00 |
|
|
ea417b6386
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-30 10:27:21 +03:00 |
|
|
a738b80490
|
web: People: ProfileAction: added sample modal dialog
|
2019-08-30 10:26:34 +03:00 |
|
|
9d5c5e5e8c
|
web: People: Fixed route to edit self profile on user
|
2019-08-30 10:07:43 +03:00 |
|
|
f10842c737
|
web: People: Restored start script as react-app-rewired
|
2019-08-30 09:49:12 +03:00 |
|
Daniil Senkiv
|
9288ef6b11
|
People.Client: ProfileAction: updated translations after (5513658526 )
|
2019-08-29 17:21:35 +03:00 |
|
|
fc89fa9c5d
|
web: People: ProfileAction translations
|
2019-08-29 16:47:32 +03:00 |
|
|
3f4a5475fd
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/locales/en/translation.json
|
2019-08-29 16:46:11 +03:00 |
|
|
5513658526
|
web: People: ProfileAction: form field components
|
2019-08-29 16:35:54 +03:00 |
|
|
761b4cbe23
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
web/ASC.Web.Components/package.json
web/ASC.Web.Components/yarn.lock
|
2019-08-29 16:25:31 +03:00 |
|
|
2aeec3ea68
|
web: New packages fixes
|
2019-08-29 16:23:47 +03:00 |
|
Ilya Oleshko
|
4a83ed26cb
|
web: People: Changed mapping of users to use RowContainer.
|
2019-08-29 16:04:18 +03:00 |
|
Daniil Senkiv
|
aa67df0ed7
|
People.Client: Profile, ProfileActions: removed plurals translation
|
2019-08-29 15:40:31 +03:00 |
|
Daniil Senkiv
|
ac033f3ecc
|
People.Client: Profile: added custom translated keys
|
2019-08-29 15:19:14 +03:00 |
|
Daniil Senkiv
|
a926ddb921
|
People.Client: ProfileAction: added custom translated keys
|
2019-08-29 14:32:48 +03:00 |
|
Daniil Senkiv
|
f0288226eb
|
People.Client: fixed i18n configs for showing translations in development environment
|
2019-08-29 12:07:05 +03:00 |
|
Daniil Senkiv
|
0581ba79b5
|
People.Client: deleted unused translations
|
2019-08-29 12:04:16 +03:00 |
|
|
b95922b877
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-29 09:40:59 +03:00 |
|
|
4f4aca88a9
|
web: Update packages
|
2019-08-29 09:40:44 +03:00 |
|
|
972ff20694
|
web: People: ProfileAction translations
|
2019-08-28 18:32:10 +03:00 |
|
|
b6e46a305c
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/Form/userForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# web/ASC.Web.Components/src/components/input-block/index.js
# web/ASC.Web.Components/src/index.js
|
2019-08-28 18:23:16 +03:00 |
|
|
26451fdf49
|
web: People: ProfileAction without reduxForm
|
2019-08-28 18:09:26 +03:00 |
|
Daniil Senkiv
|
7f887dfebe
|
People.Client: translated ProfileActions component
|
2019-08-28 12:02:21 +03:00 |
|
|
d16d5f1251
|
Kafka: create only one producer for instance
UserPhotoManager: optimization
|
2019-08-27 17:57:06 +03:00 |
|
Daniil Senkiv
|
6f60ebf51a
|
People.Client: translated Profile component
|
2019-08-27 16:15:07 +03:00 |
|
Daniil Senkiv
|
019c126e90
|
People.Client: fixed webpack config (f5744070ae )
|
2019-08-27 16:00:46 +03:00 |
|
Daniil Senkiv
|
81f8ee817b
|
People.Client: removed i18n function
|
2019-08-27 11:00:51 +03:00 |
|
Daniil Senkiv
|
f5744070ae
|
People.Client: added webpack config for moving translation resources
|
2019-08-27 10:59:07 +03:00 |
|
Daniil Senkiv
|
3b83a376a3
|
People.Client: added independent resource files and instances of i18next for all project and profile component
|
2019-08-27 10:56:41 +03:00 |
|
Daniil Senkiv
|
42614e8a34
|
People.Client: added packages and changed scripts
|
2019-08-27 10:47:51 +03:00 |
|
|
6cae722b9d
|
kafka disabled by default
|
2019-08-23 15:49:23 +03:00 |
|
NikolayRechkin
|
8677d3c236
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-23 12:51:35 +03:00 |
|
NikolayRechkin
|
efa072eb60
|
web: People: fix filter
|
2019-08-23 12:51:13 +03:00 |
|
|
2ec9fe41e9
|
web: People: ProfileAction: converting employee wrapper to member model
|
2019-08-23 11:28:16 +03:00 |
|
|
9af50a83b0
|
web: People: profile actions: fix response error checking
|
2019-08-23 11:26:37 +03:00 |
|
|
fe2ecf4773
|
web: People: Added opportunity to change employee type
|
2019-08-22 17:11:38 +03:00 |
|
Ilya Oleshko
|
2a3ad06117
|
web: People: Profile: Redesigned on styled components. Added pending indicators.
|
2019-08-22 16:41:05 +03:00 |
|
|
9583a96103
|
web: People: Added selection of group filter by TreeMenu
|
2019-08-21 17:54:37 +03:00 |
|
|
4131663a64
|
web: People: Fixed display Group filter label
|
2019-08-21 17:52:33 +03:00 |
|
|
7b69190cbc
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-08-21 16:53:23 +03:00 |
|
|
efa7dbd1d4
|
web: People: Added opportunity to Enable/Disable group of users
|
2019-08-21 16:53:09 +03:00 |
|
|
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 |
|