|
|
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 |
|
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 |
|
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 |
|
