Commit Graph

1319 Commits

Author SHA1 Message Date
65b2d25520 Web: People: fixed profile menu blocks alignment 2020-02-14 11:46:37 +03:00
5791c1bcf5 Web: People: fixed profile text color and fields size 2020-02-14 11:26:29 +03:00
785cc4c5a3 Files: DI 2020-02-13 18:12:27 +03:00
c0cc00bfbe Files:DI 2020-02-13 15:19:25 +03:00
507cd94e98 Merge branch 'master' into feature/redesign
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-02-13 11:09:37 +03:00
de4b4a0dde Files: DI 2020-02-12 18:21:58 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
Ilya Oleshko
e99d1acc3c Web: Common: Layout: Added use of icons from module 2020-02-12 16:18:23 +03:00
00246f7f9f Files: Startup 2020-02-12 13:48:58 +03:00
0da5b85eb8 Files: DI, EF 2020-02-12 13:29:10 +03:00
43f662acd1 Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign 2020-02-12 13:07:45 +03:00
8298a77717 Web: Client: fixed tree icons 2020-02-12 13:03:23 +03:00
Ilya Oleshko
1d7bdb03b0 People.Client: Home: Fixed GroupButtonsMenu size with pined Aside on mobile 2020-02-12 11:40:56 +03:00
159bdc1a72 Merge branch 'master' into feature/redesign
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-02-12 09:40:56 +03:00
816231d9e9 Files: DI 2020-02-11 18:15:39 +03:00
fdf5b27903 Files: DI 2020-02-11 18:10:30 +03:00
c900a319de Added update user list after remove disabled user 2020-02-11 15:28:18 +03:00
9fd33a1ef8 Files: DI 2020-02-11 15:10:06 +03:00
cc6b4db2f1 Files: DI 2020-02-11 14:51:45 +03:00
3fa9046bec Merge branch 'master' into feature/elastic 2020-02-11 14:08:26 +03:00
3e61074a44 Files: DI 2020-02-11 12:39:32 +03:00
Ilya Oleshko
ebceb3b346 People.Client: Home: Fixed default DropDown direction for action button 2020-02-11 11:12:39 +03:00
2d73943b81 Files: DI 2020-02-10 19:04:54 +03:00
03af1cfac0 Files: DI 2020-02-10 16:46:01 +03:00
26b6ef0e2c Files: DI 2020-02-10 16:06:03 +03:00
b57007d28b Web: People: hidden tree icons 2020-02-10 15:49:50 +03:00
1e833b4ecd Web: People: fixed people group colors and font 2020-02-10 15:21:05 +03:00
607478a658 Files: DI 2020-02-08 21:44:55 +03:00
Daniil Senkiv
1b9700aa19 removed comment 2020-02-07 19:48:13 +03:00
e0fc7e6f39 Files: DI 2020-02-07 17:31:15 +03:00
96687f4fa6 Files: DI 2020-02-07 14:34:25 +03:00
3c23e2f4a7 Files: DI 2020-02-07 13:29:16 +03:00
Daniil Senkiv
343b836fb0 People.Client: fixed (e5cc1558cd) 2020-02-07 11:39:29 +03:00
Daniil Senkiv
ff5d59b0c8 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2020-02-06 16:31:35 +03:00
Daniil Senkiv
e5cc1558cd People.Client: Profile: added updating profile after changing user status or avatar 2020-02-06 16:31:27 +03:00
b9a6d22821 Files: DI 2020-02-06 16:30:21 +03:00
6c8e2f030b Files: DI 2020-02-06 16:06:36 +03:00
NikolayRechkin
db5cddf7db Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2020-02-06 15:55:46 +03:00
NikolayRechkin
8b1f5ea1cb web: People: small fix a loader 2020-02-06 15:55:34 +03:00
b150f93f85 web: People: Added error handling in GroupAction 2020-02-06 15:28:42 +03:00
a5384d10ee File: DI 2020-02-06 14:55:11 +03:00
Daniil Senkiv
5245058257 People.Client: Profile: added toast and translations 2020-02-06 14:50:24 +03:00
Daniil Senkiv
8efd3217df People.Client: Home: fixed showing toast 2020-02-06 14:49:35 +03:00
Daniil Senkiv
949e8e44b8 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2020-02-06 14:29:29 +03:00
Daniil Senkiv
89d06ae478 People.Client: Home: fixed problem with fetching people after changing user status 2020-02-06 14:29:20 +03:00
35eca0d863 Files: DI 2020-02-06 11:56:12 +03:00
Ilya Oleshko
dfc9c0250a Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-02-06 11:17:28 +03:00
Ilya Oleshko
6e3553bee2 People.Client: Home: Fixed position for actions menu on tablet devices, small code styling 2020-02-06 11:17:11 +03:00
Daniil Senkiv
77f0d160ac People.Client: Profile: cleaning profile info in redux after unmounting component 2020-02-06 10:17:28 +03:00
67049195f8 Files: DI, EF 2020-02-05 18:37:31 +03:00
Daniil Senkiv
362f8021f1 People.Client: ProfileAction: added translations 2020-02-05 17:57:49 +03:00
Daniil Senkiv
0e4fca3274 People.Client: Profile: added translations 2020-02-05 17:57:34 +03:00
Daniil Senkiv
6ca37b22b9 People.Client: Home: userContent: fixed color 2020-02-05 17:03:18 +03:00
508efb1fca Files: EF, DI 2020-02-05 16:33:09 +03:00
Daniil Senkiv
53b0de8704 People.Client: Profile: Header: fixed icon style 2020-02-05 16:08:26 +03:00
Daniil Senkiv
5ae02954e3 People.Client: Home: removed blue border on tap from touch devices 2020-02-05 15:57:35 +03:00
Daniil Senkiv
874b24c4be People.Client: i18n config: debug only in development mode 2020-02-05 15:44:48 +03:00
Daniil Senkiv
dec059457c People.Client: Import, Reassign:fixed i18n config 2020-02-05 12:33:31 +03:00
Daniil Senkiv
23b278e644 People.Client: Home: changed color for disabled and pending users, removed useless import 2020-02-05 11:56:33 +03:00
ff84afb110 Merge branch 'master' into feature/elastic
# Conflicts:
#	web/ASC.Web.Core/SetupInfo.cs
2020-02-05 11:43:03 +03:00
646f061647 Files: DocumentServiceTracker 2020-02-05 11:30:04 +03:00
f43761a3d4 web: People: Added trim for url param "search" 2020-02-05 10:41:56 +03:00
1026ad93b2 Files: EF, DI 2020-02-04 12:08:21 +03:00
767448acb9 Files: EF, DI 2020-02-04 11:41:04 +03:00
Daniil Senkiv
f481452dec People.Client: ProfileAction: createUserForm: added translations to PasswordField components 2020-02-03 18:49:27 +03:00
0229c1aeec Files: Token 2020-02-03 18:31:53 +03:00
Daniil Senkiv
8c5b825e17 People.Client: ProfileActions: updateUserForm: added translations 2020-02-03 17:58:29 +03:00
671b043b7e Files: GoogleDriveApp 2020-02-03 16:31:42 +03:00
Daniil Senkiv
2afc96bcc1 People.Client: Profile: fixed translations 2020-02-03 16:09:53 +03:00
Daniil Senkiv
fc8dbcb9cb People.Client: Profile: helpbutton: fixed area for tapping on touch devices 2020-02-03 16:09:29 +03:00
8c2b39406f Merge branch 'master' into feature/merge 2020-02-03 14:29:41 +03:00
51d8b9758c Files: BoxApp 2020-02-03 13:41:24 +03:00
f0cec97c3e web: common: Added ErrorBoundary component with componentDidCatch and new Error520Container show 2020-02-03 11:36:25 +03:00
Daniil Senkiv
d657d59556 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2020-02-03 08:50:05 +03:00
f3e670e393 web: Common: Extended PeopleSelector component with Me option 2020-02-02 17:33:44 +03:00
0a8aa83813 Files: FileStorageServiceController 2020-01-31 18:32:27 +03:00
Daniil Senkiv
6f2bf3986d People.Client: Profile: increased area for tapping IconButton 2020-01-31 18:26:21 +03:00
Daniil Senkiv
1a54529d34 People.Client: Home: increased area for tapping IconButton 2020-01-31 18:26:08 +03:00
fa1cf519f9 Files: Global 2020-01-31 16:03:21 +03:00
Daniil Senkiv
5469f0698e People.Client: InviteDialog: fixed problem with changing language 2020-01-31 15:25:15 +03:00
a149b2409f Files: removed not using classes 2020-01-31 14:21:18 +03:00
acde301b26 Merge branch 'master' into feature/merge 2020-01-31 10:59:00 +03:00
2dba07ea11 Files: Global 2020-01-31 10:56:40 +03:00
Daniil Senkiv
83e965841f Merge branch 'master' into feature/translations 2020-01-30 17:46:06 +03:00
Daniil Senkiv
6419c9b588 People.Client: Profile: fixed icon size in contact info and social profiles 2020-01-30 17:24:48 +03:00
7d5a698be6 Files: TagDao 2020-01-30 16:59:42 +03:00
Daniil Senkiv
ebe0323d77 People.Client: Home: Header: fixed style 2020-01-30 16:30:00 +03:00
Daniil Senkiv
49d6a4d049 People.Client: MainButton: replaced icons 2020-01-30 13:50:05 +03:00
Daniil Senkiv
693d8d63b5 People.Client: Home: changed translations according to new design 2020-01-30 11:31:57 +03:00
2a8d9ebd50 Dao: SecurityDao 2020-01-29 17:25:30 +03:00
48409f8f82 Files: folderDao 2020-01-29 15:42:17 +03:00
Daniil Senkiv
f78f0cd374 i18n.reloadResources: fixed for reducing reloading translations 2020-01-29 13:15:46 +03:00
Daniil Senkiv
f7f93a2712 People.Client: Dialogs: Added props to base constructor 2020-01-28 18:55:45 +03:00
08d51bb1ed Files: FileDao 2020-01-28 17:59:59 +03:00
Daniil Senkiv
2f953e4de9 Merge branch 'master' into feature/translations 2020-01-28 17:13:00 +03:00
Daniil Senkiv
556577061b People.Client: ProfileActon: added maxLength prop to firstname and lastname field 2020-01-28 16:38:11 +03:00
Daniil Senkiv
3902daafa6 People.Client: GroupAction: removed useless container for header 2020-01-28 14:56:01 +03:00
Daniil Senkiv
8e9cad46c9 People.Client: fixed width of GroupButtonsMenu 2020-01-28 14:43:28 +03:00
Daniil Senkiv
c969609db9 People.Client: Profile: changed order of requests after changing language 2020-01-28 14:08:27 +03:00
Daniil Senkiv
6e0fe3023e People.Client: ProfileAction: fixed translations 2020-01-28 13:20:50 +03:00
Daniil Senkiv
f017988679 People.Client: Profile: changed strings to customNames 2020-01-28 12:03:22 +03:00
Daniil Senkiv
f66edbb2bf People.Client: fixed translation keys 2020-01-28 11:44:22 +03:00
Daniil Senkiv
30bc717afa People.Client: ProfileAction: added new translations, fixed i18n config 2020-01-27 18:42:56 +03:00
Daniil Senkiv
433c993c4b People.Client: Home: added new translations, fixed i18n config 2020-01-27 18:24:31 +03:00
4cee8feb84 Files: AbstractDao 2020-01-27 17:58:33 +03:00
Daniil Senkiv
648ff6361d People.Client: Article: added new translations, fixed i18n config 2020-01-27 17:58:10 +03:00
Daniil Senkiv
06a25d69a4 People.Client/Web.Component: fixed render after changing user language 2020-01-27 17:46:11 +03:00
Daniil Senkiv
63afd6d962 People.Client: GroupAction: fixed translations, added new 2020-01-27 14:47:18 +03:00
b087949c10 Files: init commit 2020-01-27 14:15:18 +03:00
Daniil Senkiv
998ea6f320 People.Client: removed useless i18n config 2020-01-26 15:32:40 +03:00
Daniil Senkiv
9d82e657ed Merge branch 'master' into feature/translations
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/constants/index.js
2020-01-26 14:12:37 +03:00
Daniil Senkiv
960e9bdcb7 fix (c5e1dd8aa5) 2020-01-24 16:16:41 +03:00
Daniil Senkiv
c5e1dd8aa5 People.Client: Home: Body: fixed applying translations for ContextMenuButton after first load of translation file 2020-01-24 16:02:58 +03:00
5edc461090 People.Client: Home: fixed empty screen when go back button clicked from another pages 2020-01-24 14:57:05 +03:00
Daniil Senkiv
73f52b630d People.Client: InviteDialog: fixed (01459d0968) for Mozilla browser 2020-01-24 14:12:26 +03:00
9763b8aa87 People.Client: Home: fixed empty screen when go back button clicked from another pages 2020-01-24 11:54:22 +03:00
cf0bad86c2 People.Client: Home, Profile: using props withBodyAutoFocus from PageLayout 2020-01-24 11:25:54 +03:00
Daniil Senkiv
01459d0968 People.Client: InviteDialog: fixed: first copy toast had wrong language, if language changed earlier 2020-01-23 18:38:35 +03:00
Daniil Senkiv
b39e6ff690 People.Client: Profile: fixed (ac592c599a) and (0cb31bfa24) 2020-01-23 15:51:14 +03:00
38f5c93172 People.Client: Home: fixed empty screen when go back button clicked from another pages 2020-01-23 15:38:11 +03:00
Daniil Senkiv
17db173fc8 People.Client: ProfileActions: added lowercase config, commented unused translation 2020-01-23 11:12:40 +03:00
Daniil Senkiv
0cb31bfa24 Web.Common, People.Client: triggered updating modules language after changing user language 2020-01-23 10:58:08 +03:00
Daniil Senkiv
ac592c599a People.Client: triggered updating customNames after changing user language 2020-01-22 16:23:47 +03:00
Daniil Senkiv
1abb45a2ba People.Client: removed fake custom names 2020-01-22 13:46:19 +03:00
Daniil Senkiv
2c09e6cf10 People.Client: ProfileAction: applied real custom names 2020-01-22 13:45:43 +03:00
Daniil Senkiv
ead82ac91e People.Client: Profile: applied real custom names 2020-01-22 13:40:06 +03:00
Daniil Senkiv
48218df13b People.Client: Home: applied real custom names 2020-01-22 10:17:05 +03:00
Daniil Senkiv
68a6e7261a People.Client: GroupAction: fixed translations 2020-01-22 09:54:49 +03:00
Daniil Senkiv
46fc0397df People.Client: GroupAction: applied real custom names 2020-01-22 09:47:44 +03:00
Daniil Senkiv
57db4e467f People.Client: InviteDialog: applied real custom names 2020-01-21 18:20:12 +03:00
Daniil Senkiv
fe9131eed3 People.Client: DeleteProfileEverDialog: applied real custom names 2020-01-21 18:17:41 +03:00
Daniil Senkiv
bfc06bb1f3 People.Client: Article: applied real custom names 2020-01-21 18:13:57 +03:00
Daniil Senkiv
e4fff6db08 People.Client: ProfileAction: changed redux to localStorage for storing language value 2020-01-21 11:16:51 +03:00
Daniil Senkiv
be4c362a3e People.Client: Profile: changed redux to localStorage for storing language value 2020-01-21 11:13:20 +03:00
Daniil Senkiv
e6835a3722 People.Client: Home: changed redux to localStorage for storing language value 2020-01-21 11:08:41 +03:00
Daniil Senkiv
9db003053d People.Client: GroupAction: changed redux to localStorage for storing language value 2020-01-21 10:22:00 +03:00
Daniil Senkiv
a0d88bf43b People.Client: InviteDialog: removed withRouter HOC 2020-01-21 10:14:46 +03:00
Daniil Senkiv
79ac4d7075 People.Client: DeleteProfileEverDialog: added withRouter HOC 2020-01-21 10:13:46 +03:00
Daniil Senkiv
26f51e714c People.Client: DeleteSelfProfileDialog: changed redux to localStorage for storing language value 2020-01-21 10:03:19 +03:00
Daniil Senkiv
556d2f19b1 People.Client: DeleteProfileEver: changed redux to localStorage for storing language value 2020-01-21 10:01:21 +03:00
Daniil Senkiv
7ea8ef114e People.Client: ChangePhoneDialog: changed redux to localStorage for storing language value 2020-01-21 09:55:55 +03:00
Daniil Senkiv
5ad8c8237c People.Client: ChangeEmailDialog: removed withRouter HOC 2020-01-21 09:46:50 +03:00
Daniil Senkiv
5f486e0c01 People.Client: ChangePasswordDialog: changed redux to localStorage for storing language value 2020-01-21 09:44:21 +03:00
Daniil Senkiv
2b961dd144 People.Client: ChangeEmailDialog: changed redux to localStorage for storing language value 2020-01-21 09:36:08 +03:00
Daniil Senkiv
83559706af People.Client: Article: changed redux to localStorage for storing language value 2020-01-21 09:11:58 +03:00
Daniil Senkiv
255d5c5784 People.Client: InviteDialog:changed redux to localStorage for storing language value 2020-01-21 08:59:05 +03:00
Daniil Senkiv
8e772cce97 People.Client: Home: fixed: initial language value is getting from localStorage 2020-01-20 18:39:08 +03:00
Daniil Senkiv
28b0eced9d People/Web.Client: selecting portal language, if user language not defined 2020-01-20 14:17:39 +03:00
4bad85defe moved from hotfix/10.5.2 2020-01-17 16:58:26 +03:00
Daniil Senkiv
c6439b6026 People.Client: ProfileAction: fixed showing long departments name 2020-01-16 16:39:54 +03:00
Daniil Senkiv
b53defb734 People.Client: Profile: fixed showing long text 2020-01-16 16:39:10 +03:00
Daniil Senkiv
ff47af27b9 People.Client: ProfileInfo: deleted unused ModalDialog component 2020-01-16 14:09:08 +03:00
Daniil Senkiv
de54bcf86b Web.Common: PageLayout: fixed section-header style for content 2020-01-16 12:25:28 +03:00
Daniil Senkiv
258ec92046 People.Client: Home: deleted unused ModalDialog component 2020-01-15 18:40:50 +03:00
Daniil Senkiv
3212a46035 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2020-01-15 17:48:04 +03:00
Daniil Senkiv
31dd1e903f Web.Common: PageLayout: fixed section header style 2020-01-15 17:38:40 +03:00
09426943b2 web: People: Update all dependencies 2020-01-15 11:59:25 +03:00
Daniil Senkiv
0a09aaaa07 Web.Common: AdvancedSelector: fixed styles, reverted (c6fbf51389) 2020-01-13 16:27:18 +03:00
Daniil Senkiv
c6fbf51389 People.Client: DepartmentField: fixed border-color style for input 2020-01-13 15:24:43 +03:00
Daniil Senkiv
4a0deedd7d People.Client: fixed placeholder, fixed GroupSelector component 2020-01-13 12:48:07 +03:00
Daniil Senkiv
2011543224 People.Client: added link to social profiles and contact information 2020-01-10 20:31:04 +03:00
Daniil Senkiv
1b78e52321 People.Client: GroupAction: added Enter handling for creating department 2020-01-10 16:41:35 +03:00
Daniil Senkiv
e7779cdec2 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2020-01-09 17:42:18 +03:00
Daniil Senkiv
dea42683cf People.Client: InviteDialog: deleted unused translations 2020-01-09 17:42:05 +03:00
25fc0669f7 web: Fixed handleAnyClick for DropDown 2020-01-09 16:27:49 +03:00
Ilya Oleshko
d22352e75e Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-27 15:59:47 +03:00
a63abfc9b7 ASC.People: AvatarEditor: added file selection text for mobile devices 2019-12-27 15:56:12 +03:00
Ilya Oleshko
b1e289ebb9 Web: People: Home: Fixed filter sorting style 2019-12-27 15:55:57 +03:00
4f1080da05 ASC.People: ProfileAction: enlarged button area 2019-12-27 15:31:12 +03:00
8dcff0883d ASC.People: Home: fixed fontWeight in user list 2019-12-27 14:26:46 +03:00
b3e65be930 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-27 14:03:42 +03:00
692279b4b0 ASC.People: GroupAction, ProfileAction: using combobox default option 2019-12-27 14:03:35 +03:00
06afd70b7f web: People: Fixed font-weight in Group Name TextInput 2019-12-27 13:59:41 +03:00
Daniil Senkiv
fe044697d3 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-27 13:41:46 +03:00
48e56d462a Api: people. Fixed "Sequence contains no elements" error while saving empty contacts list 2019-12-27 13:19:35 +03:00
ddb222fd86 ASC.People: GroupAction: search block is hidden because it requires clarification of its work on large lists 2019-12-27 11:43:55 +03:00
Daniil Senkiv
9850473222 People.Client:dialogs: fixed email style 2019-12-27 11:42:44 +03:00
10918fe9e1 Web: People: fixed merge 2019-12-27 11:05:06 +03:00
87e17ff100 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Header/index.js
2019-12-27 10:53:11 +03:00
5430f8c734 Web: People: fixed icon arrow clickability 2019-12-27 10:49:14 +03:00
Daniil Senkiv
8a65ac9cec Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-27 10:19:18 +03:00
1f15f4f1e2 ASC.People: GroupAction: truncate header text 2019-12-27 10:17:17 +03:00
Daniil Senkiv
e87b17e6c9 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-27 10:14:31 +03:00
d94d386f57 ASC.People: GroupAction: max-width: 1024px 2019-12-27 09:49:05 +03:00
fcdf0a0f97 ASC.People: GroupAction: Grid styled selected-items 2019-12-26 18:34:19 +03:00
a8d4d0b6a9 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-26 17:08:36 +03:00
e0a9fabb0b Web: Common: fixed help-button styles 2019-12-26 17:08:24 +03:00
d1099fdb79 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-26 16:55:30 +03:00
386fa9df6e ASC.People: ProfileAction: Fixed header text 2019-12-26 16:55:06 +03:00
3f69ca4860 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-26 16:23:52 +03:00
47f0428931 web: People: Replaced bind to separated methods 2019-12-26 16:23:42 +03:00
a7ad25fee5 ASC.People: GroupAction: Fixed translations 2019-12-26 16:08:24 +03:00
193651b382 Web: People: fixed profile arrow clickability 2019-12-26 15:41:26 +03:00
a6aed107fc Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-26 15:26:14 +03:00
87bfe9ffbe ASC.People: GroupAction: indentation fixed 2019-12-26 15:26:07 +03:00
82023841f4 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-26 15:12:23 +03:00
cca92425d0 ASC.People: GroupAction: Fixed translations 2019-12-26 15:11:38 +03:00
1aff07e97f Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-26 15:11:33 +03:00
91c528a8e3 web: People: Hidden not implemented InviteAgain action 2019-12-26 15:11:24 +03:00
edd654a2a4 web: People: Change IconButton to ContextMenuButton with more actions 2019-12-26 15:10:39 +03:00
619615a2ad ASC.People: customNames: Fixed translations 2019-12-26 14:51:14 +03:00
46dce238b2 Web: People: fixed help-button clickability 2019-12-26 13:49:41 +03:00
1870e125f9 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-26 12:24:00 +03:00
a45db44549 Web: People: fixed clickability of department icon 2019-12-26 12:23:54 +03:00
763136b4b3 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-26 12:12:20 +03:00
3241a4f25c web: People: Fixed goBack actions 2019-12-26 12:12:13 +03:00
Daniil Senkiv
54121b1323 People.Client: fixed TreeMenu colors 2019-12-26 12:00:15 +03:00
NikolayRechkin
779e04eb5b web: people: added placeholder for filter input field 2019-12-26 11:46:05 +03:00
Daniil Senkiv
19f391bf0d Merge branch 'master' into feature/separated-modal-dialogs 2019-12-26 10:15:09 +03:00
Daniil Senkiv
567f006285 People.Client: Profile: createUserForm: added hasError prop to EmailInput 2019-12-25 18:23:46 +03:00
aea429a0ad Api: people. Fixed saving contacts 2019-12-25 18:16:29 +03:00
Daniil Senkiv
9b480c349b Merge branch 'master' into feature/separated-modal-dialogs
# Conflicts:
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
#	web/ASC.Web.Components/package.json
2019-12-25 17:44:37 +03:00
Daniil Senkiv
b739b15c77 People.Client: dialogs: replaced functions to arrow functions 2019-12-25 17:28:38 +03:00
Daniil Senkiv
14b88b8d56 People.client: changeEmailDialog: fixed translations 2019-12-25 17:21:04 +03:00
Daniil Senkiv
bb39cb5611 people.client: changeEmailDialog: added prop user instead of 2 props 2019-12-25 17:18:49 +03:00
Daniil Senkiv
7bc8e59172 people.client: fixed conflict 2019-12-25 16:43:03 +03:00
ff5de59b3e ASC.People: ProfileAction: Fixed translations 2019-12-25 15:58:12 +03:00
Ilya Oleshko
6f969da694 Web: People: Fixed profile info order on Profile page 2019-12-25 13:37:11 +03:00
Ilya Oleshko
e44a78a94b Web: People: Fixed translations on Profile page 2019-12-25 13:36:32 +03:00
Ilya Oleshko
ca1eb07e8c Web: People: Fixed max-width CSS property for User page 2019-12-25 12:47:44 +03:00
Daniil Senkiv
177b50909e Merge branch 'master' into feature/separated-modal-dialogs
# Conflicts:
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
2019-12-25 11:37:34 +03:00
10739ad361 ASC.People: ProfileAction: createUserForm: unnecessary code removed 2019-12-25 11:24:43 +03:00
51e9f790b4 ASC.People: ProfileAction: Added remove button for contact information 2019-12-25 09:57:57 +03:00
38cffb5471 ASC.People: ProfileAction: CSS styles and translations changed 2019-12-24 14:15:49 +03:00
47d4ba6f17 ASC.People: ProfileAction: InfoFieldContainer: using Heading from asc-web-components 2019-12-24 12:48:35 +03:00
Nikolay Rechkin
9e0995ac00
Merge pull request #17 from ONLYOFFICE/feature/ef
Feature/ef
2019-12-24 10:54:47 +03:00
10e9a07c18 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-24 09:56:14 +03:00
ddf5a606a1 web: Update yarn.lock files 2019-12-24 09:56:03 +03:00
6a4e992c70 ASC.People: Home page: user link fontWeight changed 2019-12-24 09:52:54 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
224e6adc45 Merge branch 'master' into feature/consumers 2019-12-23 15:57:49 +03:00
2b5dd8b3cf Merge branch 'master' into feature/ef 2019-12-23 15:47:10 +03:00
Ilya Oleshko
122b315a5a Web: People: Fixed Import button visibility at Article component 2019-12-23 14:06:29 +03:00
Daniil Senkiv
fca6ed2675 People.Client: dialogs: ChangeEmailDialog: fixed error "Can't perform a React state update on an unmounted component." 2019-12-23 14:01:01 +03:00
Daniil Senkiv
157f1c7d10 web.components: EmailInput: changed util for validating email, applied changes to EmailInput component. Applied EmailInput changes for all using places. Fixed readme.
Added new translations for validation errors.
2019-12-23 12:02:03 +03:00
Daniil Senkiv
2b74c0c4b5 People.Client: dialogs: ChangeEmailDialog: added keyup Enter handling 2019-12-20 15:24:17 +03:00
Daniil Senkiv
68b0afe9ad People.Client: dialogs: ChangeEmailDialog: added translations 2019-12-20 15:23:07 +03:00
Daniil Senkiv
5a472bb41b Merge branch 'master' into feature/separated-modal-dialogs 2019-12-20 15:06:13 +03:00
Daniil Senkiv
dd182088cc People.Client: dialogs: ChangeEmailDialog: applied FieldContainer, deleted disabling send button 2019-12-20 14:46:51 +03:00
b686e99f16 web: Common: Moved Layout and PageLayout to asc-web-common 2019-12-20 14:35:53 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
Ilya Oleshko
0552ee6673 Web: People: Fixed row side info truncate for Text component at People row 2019-12-20 11:58:08 +03:00
Daniil Senkiv
40bbe9a0d9 Merge branch 'master' into feature/separated-modal-dialogs
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
2019-12-20 11:37:11 +03:00
Daniil Senkiv
c16cd68f8f Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-20 10:50:45 +03:00
Daniil Senkiv
9933f626b3 People.Client: Home: added translations 2019-12-19 15:21:24 +03:00
Daniil Senkiv
85cd5c41ba People.Client: dialogs: ModalDialogContainer: fixed styles 2019-12-19 14:05:08 +03:00
Daniil Senkiv
305a3b229f People.Client: dialogs: InviteDialog: added ru translations 2019-12-19 14:03:40 +03:00
Daniil Senkiv
b3e17009d4 People.Client: dialogs: deleted cancel button 2019-12-19 13:38:32 +03:00
ead6333081 Web: People: fixed help-button position 2019-12-19 12:27:45 +03:00