Alexey Safronov 116702d286 Merge branch 'release/v2.6.0' into develop ... # Conflicts: # packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/ImportStep/index.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js # packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/ImportStep/index.js # packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js # packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/index.tsx # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js # packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js # packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/index.tsx # packages/client/src/pages/PortalSettings/categories/data-import/components/ImportStep.tsx # packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx # packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx # packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/index.tsx # packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/index.tsx # packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx # packages/client/src/pages/PortalSettings/categories/data-import/sub-components/UsersInfoBlock.tsx # packages/login/src/components/Invalid.tsx		2024-07-22 20:23:04 +04:00
..
__mocks__
.storybook
api	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
components	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
constants	Rebranding: move PRODUCT_NAME to Common.json	2024-07-18 18:48:09 +04:00
dialogs/conflict-resolve
enums	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
HOC
hooks	Shared:Components:Selector: Added info bar	2024-07-09 18:39:34 +05:00
pages/PreparationPortal	Rebranding: move PRODUCT_NAME to Common.json	2024-07-18 18:48:09 +04:00
polyfills
routes	Merge branch 'release/v2.6.0' into develop	2024-07-11 12:27:31 +04:00
selectors	Shared: Selector: fix translations in bread crumbs	2024-07-18 19:09:56 +04:00
skeletons
store	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
styles
sw
themes	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
types	Add oauth origin for client config	2024-06-28 18:44:39 +03:00
utils	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
.babelrc.json
.eslintrc.cjs
.gitignore
.prettierrc.json
babel.config.ts
index.d.ts
jest.config.ts
package.json	Merge branch 'release/v2.6.0' into develop	2024-07-16 12:59:23 +04:00
tsconfig.eslint.json
tsconfig.json