Commit Graph

310 Commits

Author SHA1 Message Date
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