|
|
82f32d8b0b
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/routes/portalSettings.js
# packages/client/src/store/DialogsStore.js
|
2024-03-05 20:12:08 +05:00 |
|
Vladimir Khvan
|
f5e4f141ae
|
Web: Client: JavascriptSDK: isDocument icon prop was added to FileInput
|
2024-03-04 20:57:50 +05:00 |
|
Vladimir Khvan
|
719ffe2b60
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/src/routes/portalSettings.js
packages/client/src/store/DialogsStore.js
packages/client/src/store/index.js
packages/common/constants/index.js
packages/components/file-input/index.js
packages/components/paging/index.js
packages/components/progress-bar/index.js
packages/components/row/index.js
packages/components/table-container/TableGroupMenu.js
packages/components/themes/base.js
packages/shared/api/settings/index.ts
packages/shared/components/paging/Paging.styled.ts
packages/shared/components/table/sub-components/TableHeaderCell.tsx
packages/shared/utils/catalogIconHelper.ts
public/locales/en/Common.json
|
2024-02-13 16:16:29 +05:00 |
|
|
|
e61e4c4228
|
Shared:Components: fix storybook build
|
2024-01-10 15:54:04 +03:00 |
|
|
|
4433391c23
|
Client: fix wrong import - export for shared components
|
2024-01-10 11:01:43 +03:00 |
|
|
|
e68b1610a0
|
Shared:Components:FileInput: rewrite to typescript
|
2023-12-07 17:25:36 +03:00 |
|
