gopienkonikita 1c0f72731d Merge branch 'develop' into feature/templates ... # Conflicts: # packages/client/public/locales/en/Files.json # packages/client/src/components/FilesPanels/index.js # packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js # packages/client/src/components/panels/AddUsersPanel/index.tsx # packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js # packages/client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js # packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js # packages/client/src/store/DialogsStore.js # packages/shared/components/selector/Selector.tsx # packages/shared/components/selector/Selector.types.ts		2024-07-25 11:32:25 +03:00
..
__mocks__
.storybook
api	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
components	Merge branch 'develop' into feature/templates	2024-07-25 11:32:25 +03:00
constants	Rebranding: move PRODUCT_NAME to Common.json	2024-07-18 18:48:09 +04:00
dialogs/conflict-resolve
enums	Merge branch 'develop' into feature/templates	2024-07-25 11:32:25 +03: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	Merge branch 'develop' into feature/templates	2024-07-25 11:32:25 +03:00
skeletons
store	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
styles
sw
themes	Merge branch 'develop' into feature/templates	2024-07-25 11:32:25 +03: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