DmitrySychugov 93a04c0392 Merge branch 'feature/VDR-room' into feature/VDR-indexing ... # Conflicts: # packages/client/src/HOCs/withQuickButtons.js # packages/client/src/components/FilesPanels/index.js # packages/client/src/components/QuickButtons.js # packages/client/src/pages/Home/Section/Header/index.js # packages/client/src/store/ContextOptionsStore.js # packages/client/src/store/FilesActionsStore.js # packages/client/src/store/SelectedFolderStore.ts		2024-07-11 12:35:06 +05:00
..
__mocks__
.storybook
api	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-07-11 12:35:06 +05:00
components	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-07-11 12:35:06 +05:00
constants	Merge branch 'develop' into feature/VDR-room	2024-06-27 15:13:15 +05:00
dialogs/conflict-resolve
enums	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-07-11 12:35:06 +05:00
HOC
hooks
pages/PreparationPortal
polyfills
routes
selectors	Merge branch 'feature/VDR-room' into feature/VDR-watermarks	2024-07-11 10:19:57 +03:00
skeletons
store	Merge branch 'develop' into feature/ldap-settings	2024-06-17 15:17:07 +04:00
styles
sw
themes	Merge branch 'feature/VDR-room' into feature/VDR-indexing	2024-07-11 12:35:06 +05:00
types	Renaming.	2024-06-14 13:07:19 +03:00
utils	Merge branch 'feature/VDR-room' into feature/VDR-watermarks	2024-07-11 10:19:57 +03:00
.babelrc.json
.eslintrc.cjs
.gitignore
.prettierrc.json
babel.config.ts
index.d.ts
jest.config.ts
package.json	Bump version to v2.6.0	2024-06-27 08:18:39 +03:00
tsconfig.eslint.json
tsconfig.json