Commit Graph

936 Commits

Author SHA1 Message Date
5430f8c734 Web: People: fixed icon arrow clickability 2019-12-27 10:49:14 +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
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