|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
|
51315f68ba
|
WEb: Components: HelpButton: Added tooltipMaxWidth prop.
|
2022-03-21 17:26:55 +03:00 |
|
|
371a7cd82c
|
Web: Components: HelpButton: fix tooltip offset
|
2022-03-17 16:37:11 +03:00 |
|
|
b866e5cccc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-08 18:17:41 +03:00 |
|
|
b4622b581e
|
Web:Components:Added defaultProps size to the HelpButton component.
|
2022-02-08 17:41:57 +03:00 |
|
Timofey
|
72c5c93737
|
Web: add theme support from props
|
2022-01-24 23:27:24 +08:00 |
|
|
27e14b8566
|
Web:Components:HelpButton: add support dark-theme
|
2021-12-14 11:42:14 +08:00 |
|
|
298c94e042
|
Web: Components: fix test
|
2021-11-01 12:11:52 +03:00 |
|
|
ea0605ea3a
|
Web: Components: refactoring help button
|
2021-10-29 16:29:54 +03:00 |
|
Artem Tarasov
|
f181a491fb
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-06-11 14:56:52 +03:00 |
|
|
93c2f7fb07
|
Web: Component: added tooltipColor for help button
|
2021-06-09 04:02:58 +03:00 |
|
|
757e90ee7a
|
Web: Components: fixed help-button iconName path
|
2021-05-26 17:16:32 +03:00 |
|
Artem Tarasov
|
f2045ab5f0
|
Web: Components: added stories (ModalDialog, MainButton, Loader, Link, LinkWithDropDown, Label, IconButton),fix HelpButton, Heading stories
|
2021-03-08 23:18:45 +03:00 |
|
Artem Tarasov
|
c8d614a3ba
|
Web: Components: refactoring stories, add public/images to components for storybook
|
2021-03-07 14:57:26 +03:00 |
|
Vladislav Makhov
|
23e77d4822
|
web: components: fix import
|
2021-03-01 12:29:59 +03:00 |
|
Artem Tarasov
|
487fd2affc
|
Web: Components/Common: fix imports
|
2021-02-26 00:19:45 +03:00 |
|
Artem Tarasov
|
69dd27fac7
|
Web: applied new import from appserver/components
|
2021-02-24 20:11:23 +03:00 |
|
Artem Tarasov
|
5f2d0e4616
|
Web: Components: changed component hierarchy
|
2021-02-24 17:42:09 +03:00 |
|