Commit Graph

592 Commits

Author SHA1 Message Date
Daniil Senkiv
d3f06c8d3e Merge branch 'master' into refactoring/text-heading 2019-12-09 15:24:23 +03:00
Daniil Senkiv
f275c5b258 web.common: renamed Heading component to Headline 2019-12-09 15:12:25 +03:00
714e8af2b5 web: People: Update packages 2019-12-09 14:26:42 +03:00
750bd11adf web: Update packages React, Redux 2019-12-09 13:46:20 +03:00
7ded8ae4cd web: Components: Update packages (storybook, babel, jest, css-loader, postcss) 2019-12-09 12:33:39 +03:00
Daniil Senkiv
24d06b6fbe Web.common: added Heading component, applied to web.client and people modules 2019-12-06 16:13:48 +03:00
8c289784a8 Web: People: removed ReactToastify styles 2019-12-06 15:49:45 +03:00
Daniil Senkiv
3f7a026c36 People: deleted unused code 2019-12-05 20:01:34 +03:00
Daniil Senkiv
781833d38d moved actions from web.common to web.client and people modules 2019-12-05 20:00:53 +03:00
Daniil Senkiv
fac36adde8 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-04 12:38:54 +03:00
Daniil Senkiv
3ec6c287c0 web.components: Text: refactoring, separating component to 3 components, apply changes 2019-12-04 12:36:13 +03:00
17f99fb6f1 Web: People: removed reactstrap from people module 2019-12-04 10:11:13 +03:00
73d9ad590e Web: People: removed README.md 2019-12-04 10:09:36 +03:00
4128d43d89 web: Update yarn.lock files 2019-12-03 16:24:13 +03:00
Daniil Senkiv
ece2a12763 People.Client: Article: MainButton: fixed after (1ccb08b70d), fixed copying after displaying dialog 2019-12-02 16:55:16 +03:00
ae4a3af443 ASC.Web.Common: made a general layout for all clients 2019-11-28 16:36:55 +03:00
a6a28a4a72
Merge pull request #10 from ONLYOFFICE/feature/asc-web-common
Feature/asc web common
2019-11-27 10:04:51 +03:00
4e69ebebd2 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Components/src/components/field-container/README.md
#	web/ASC.Web.Components/src/components/field-container/index.js
2019-11-26 14:20:14 +03:00
74a624a8b9 update yarn.lock files 2019-11-26 14:04:37 +03:00
19fcc09e25 People.Client: ProfileAction: fix warnings:
- Warning: validateDOMNesting(...): <p> cannot appear as a descendant of <p>.
- Warning: validateDOMNesting(...): <table> cannot appear as a descendant of <p>.
2019-11-26 11:56:51 +03:00
14f92deedb Merge branch 'master' into feature/asc-web-common 2019-11-26 11:42:57 +03:00
a2c8fae6a4 web: People: Fixed broken logo on login from People page 2019-11-26 09:52:34 +03:00
3fdf474e25 web: People: Fixed login from People page 2019-11-26 09:48:27 +03:00
0639865df0 Web: People: fixed toolitp font on create user page 2019-11-25 16:34:33 +03:00
d13e729282 Merge branch 'master' into feature/asc-web-common
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
2019-11-25 15:18:34 +03:00
de2603bea9 Web: People: fixed tooltip text on edit profile page 2019-11-25 14:16:19 +03:00
af3a819b1a Web: People: fixed tooltips font on profile edit page 2019-11-25 13:31:37 +03:00
e1b8682025 global replace HelpButtonHeaderContent with helpButtonHeaderContent 2019-11-25 12:00:40 +03:00
10fd09750d Merge branch 'master' into feature/asc-web-common 2019-11-22 16:49:04 +03:00
1043cbc68b web: Common: Removed old not used code 2019-11-22 15:40:51 +03:00
7976dfdb77 web: Components: Added export PublicRoute, PublicRoute 2019-11-22 14:52:04 +03:00
59d4674885 web: Common: Added PrivateRoute 2019-11-22 14:41:57 +03:00
9052dae3ca People.Client: GroupAction: responsive design 2019-11-22 12:14:50 +03:00
02d853dbff web: components: link: fix warnings
Warning: Failed prop type: Invalid prop `children` of type `array` supplied to `<<anonymous>>`, expected `string`.
    in Unknown (at customization.js:158)
    in Trans (at customization.js:155)

Warning: Failed prop type: Invalid prop `children` of type `array` supplied to `<<anonymous>>`, expected `string`.
    in Unknown (at ProfileInfo.js:214)
    in Trans (at ProfileInfo.js:211)
2019-11-21 18:24:58 +03:00
035d729c9c web: People: Replaced PrivateRoute to ASC.Web.Common realization 2019-11-21 17:34:17 +03:00
63b839ef3a People.Client: ProfileAction: validate trimmed field values 2019-11-21 13:53:01 +03:00
2a0812c8c5 People.Client: ProfileAction: added scroll to fields with errors 2019-11-21 13:40:34 +03:00
7cb2262837 Merge branch 'master' into feature/asc-web-common
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/store/people/actions.js
2019-11-20 14:29:52 +03:00
4d2db41258 Merge branch 'master' into feature/layout-scrolling 2019-11-20 11:41:10 +03:00
3080756461 web: People: Hide paging if total count less then pageCount 2019-11-20 11:37:17 +03:00
96a3a60c1c web: People: Fixed mass re-render on group-buttons actions 2019-11-20 11:27:33 +03:00
df767e3849 web: People: Fixed setSelected value 2019-11-20 10:44:24 +03:00
83f7201bfa Web: People: added help-button header content to people pages 2019-11-20 09:45:39 +03:00
85bcc75f16 web: People: Moved some common utils to ASC.Web.Common 2019-11-19 15:35:56 +03:00
325a42f66b web: components: row: added custom shouldComponentUpdate function 2019-11-19 14:33:33 +03:00
ef0d51ab47 web: People: Moved some common constants to ASC.Web.Common 2019-11-19 14:10:56 +03:00
74530bfa76 Merge branch 'master' into feature/asc-web-common
# Conflicts:
#	products/ASC.People/Client/src/App.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
2019-11-19 13:34:36 +03:00
2a9e3d1870 web: People: Replaced services folder to ASC.Web.Common realization 2019-11-19 12:40:33 +03:00
18b0cdab2d web: People: Moved api methods: resendUserInvites and getShortenedLink into ASC.Web.Common 2019-11-18 13:52:37 +03:00
Ilya Oleshko
502060e4b2 web: People: Fixed rendering of data preview before import. 2019-11-18 11:57:54 +03:00