Commit Graph

4193 Commits

Author SHA1 Message Date
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
6b884e4230 web: components: bump version 2019-12-25 17:38:56 +03:00
Daniil Senkiv
6101248d15 web.components: ModalDialog: closed dialog on press Esc 2019-12-25 17:38:32 +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
c8e7bc7cb6 web: Update yarn.lock files 2019-12-25 16:59:00 +03:00
32086d0c01 web: components: bump version 2019-12-25 16:56:51 +03:00
2e597d82b1 web: components: refactoring and fixes:
* Simplified README.md
* Renamed some props and methods
* Added Custom validation test
* Added invalid EmailSettings.parse test
* Replaced convertEmailSettings to EmailSettings.parse
* Added value to onValidateInput result
2019-12-25 16:56:09 +03:00
Daniil Senkiv
7bc8e59172 people.client: fixed conflict 2019-12-25 16:43:03 +03:00
66ca701bac Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-25 16:30:54 +03:00
d41c2d312c ASC.Web.Common: PageLayout: article-body: padding inside scrollable content 2019-12-25 16:30:28 +03:00
NikolayRechkin
1100d04fa8 web: components: bump version 2019-12-25 16:27:20 +03:00
NikolayRechkin
aad75a867d Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-25 16:26:41 +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
NikolayRechkin
00a560d675 web: components: refactoring InputBlock 2019-12-25 12:34:07 +03:00
NikolayRechkin
f6007c1620 web: components: refactoring SearchInput 2019-12-25 12:28:54 +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
Daniil Senkiv
86cde18089 web: components: bump version 2019-12-25 11:31:09 +03:00
Daniil Senkiv
1a5fcfd86d web: common: bump version 2019-12-25 11:31:04 +03:00
Daniil Senkiv
c152d60950 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-25 11:30:44 +03:00
Daniil Senkiv
9c60f10deb web.common: applied Link to Layout sub-components 2019-12-25 11:30:29 +03:00
10739ad361 ASC.People: ProfileAction: createUserForm: unnecessary code removed 2019-12-25 11:24:43 +03:00
NikolayRechkin
7fbe278063 web: component: removed the unused code 2019-12-25 11:22:19 +03:00
51e9f790b4 ASC.People: ProfileAction: Added remove button for contact information 2019-12-25 09:57:57 +03:00
NikolayRechkin
ebbcd5b941 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-25 09:51:30 +03:00
NikolayRechkin
05d4ef47eb web: components: refactoring SearchInput 2019-12-25 09:47:42 +03:00
NikolayRechkin
0ddfd766a9 web: components: refactoring InputBlock 2019-12-25 09:46:56 +03:00
ba7cb8d529 web: components: bump version 2019-12-24 16:13:46 +03:00
5daa4dc002 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-24 16:13:21 +03:00
984c553aa8 Web: Components: fixed password-input tooltip, fixed chrome icons select 2019-12-24 16:13:13 +03:00
0c95ebf689 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-24 14:15:57 +03:00
38cffb5471 ASC.People: ProfileAction: CSS styles and translations changed 2019-12-24 14:15:49 +03:00
Ilya Oleshko
2db9adf7f5 web: components: bump version 2019-12-24 14:15:07 +03:00
Ilya Oleshko
161916121a web: Components: Paging: CSS styles changed 2019-12-24 14:14:47 +03:00
Daniil Senkiv
3bb20c6b60 web.components: Link: added new prop 2019-12-24 14:13:08 +03:00
47d4ba6f17 ASC.People: ProfileAction: InfoFieldContainer: using Heading from asc-web-components 2019-12-24 12:48:35 +03:00
87527bd339 ASC.Web.Components: toggle-content: CSS styles changed 2019-12-24 12:47:32 +03:00
e24f2b845e Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-24 12:26:23 +03:00
a5d2a65925 ASC.Web.Components: avatar: CSS styles changed 2019-12-24 12:26:16 +03:00
92692c6e92 web: common: bump version 2019-12-24 12:22:45 +03:00
2d0f98225d web: common: Fixed linux build 2019-12-24 12:22:38 +03:00
Daniil Senkiv
d103b5003d web.common: Layout: NavItem: applied Link component for wrapper, revert (37732015b3) 2019-12-24 12:03:01 +03:00
Daniil Senkiv
3ff3047dde web: common: bump version 2019-12-24 11:53:40 +03:00
Daniil Senkiv
37732015b3 web.common: Layout: NavItem: applied Link component 2019-12-24 11:53:34 +03:00
c617590f9f Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-24 11:49:35 +03:00
20a7b07899 ASC.Web.Components: button: excess icon removed 2019-12-24 11:49:27 +03:00