DmitrySychugov
|
1105568509
|
Merge branch 'develop' into feature/storybook-update
|
2023-05-31 18:20:37 +05:00 |
|
DmitrySychugov
|
69bcf4b71a
|
Web: Components: fixed floating button story
|
2023-05-29 19:51:24 +05:00 |
|
DmitrySychugov
|
d2388a72c1
|
Web: Components: enable mdx format for storybook, rename mdx files
|
2023-05-29 19:46:28 +05:00 |
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
1a2d5f3d5a
|
Web:Adding history for FloatingButton in the Components module.
|
2023-05-26 14:39:19 +03:00 |
|