Commit Graph

10 Commits

Author SHA1 Message Date
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
11b4f67041 Shared: apply yarn eslint:fix 2024-03-18 12:54:09 +03:00
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
Vladimir Khvan
abb8ee3464 Merge branch 'develop' into feature/data-migration
Conflicts:
	packages/client/public/locales/en/People.json
	packages/client/public/locales/en/Settings.json
	packages/client/public/locales/ru/People.json
	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
	packages/client/src/pages/PortalSettings/utils/settingsTree.js
	packages/client/src/store/index.js
	packages/shared/enums/index.ts
	packages/shared/themes/base.ts
	packages/shared/themes/dark.ts
2024-02-27 14:51:49 +05:00
c49f9c02a5 Shared:Components:Submenu: update type activeTabId 2024-02-21 15:59:17 +03: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
711f49cd27 Client: fix currentColorScheme 2024-01-29 10:53:59 +03:00
4433391c23 Client: fix wrong import - export for shared components 2024-01-10 11:01:43 +03:00
0b3ce31756 Client: fix after rewrite to typescript 2023-12-27 17:45:22 +03:00
8059a1fbda Shared:Components:Submenu: rewrite to typescript 2023-12-26 12:42:16 +03:00