d44f0ea5f0
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Components/src/components/help-button/index.js
2019-11-29 12:22:14 +03:00
ae4a3af443
ASC.Web.Common: made a general layout for all clients
2019-11-28 16:36:55 +03:00
f46c12cc32
Update yarn.lock files
2019-11-27 14:26:20 +03:00
506704c54a
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Components/src/components/help-button/index.js
2019-11-27 14:14:07 +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
23e3d28857
web: Replaced history to asc-web-common variant
2019-11-15 16:44:54 +03:00
a75d6e7ecc
web: Removed auth folder from store (after change to asc-web-common variant)
2019-11-15 16:29:49 +03:00
cac19cc75e
Merge remote-tracking branch 'remotes/origin/master' into feature/layout-scrolling
2019-11-15 15:36:21 +03:00
2d47d639dd
web: People: Replaced auth store to ASC.Web.Common realization
2019-11-15 12:38:31 +03:00
Ilya Oleshko
66d13c6750
web: People: Added Import page
2019-11-15 11:18:00 +03:00
1b3e977d0e
People.Client: GroupAction page has common layout scroll
2019-11-14 15:37:22 +03:00
f8ef4275c7
People.Client: Home page: RowContainer without ReactWindow
2019-11-14 15:28:42 +03:00
02dde786af
People.Client: Home page has common layout scroll
2019-11-14 15:15:33 +03:00
17ef3569ee
Merge branch 'master' into feature/asc-web-common
2019-11-13 16:14:32 +03:00
c12141897f
web: Added check of isAxiosError ("Network error" for example)
2019-11-13 16:12:46 +03:00
242c544557
web: Changed redirect methods to error pages
2019-11-13 15:35:56 +03:00
e69d2900ef
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
2019-11-13 10:55:42 +03:00