Fix conflicta

Signed-off-by: Artem Savchenko <armisav@gmail.com>
This commit is contained in:
Artem Savchenko
2026-05-10 09:15:51 +07:00
parent c81032d452
commit b9f2f9d5b1
4 changed files with 41 additions and 35 deletions
+6
View File
@@ -2,6 +2,12 @@
Changelog.
## [unreleased]
* 🚀 FEATURES: · Add StringFromEnum and EnumFromString process functions ([#10806](https://github.com/hcengineering/platform/issues/10806)) · Add left menu for styled text ([#10807](https://github.com/hcengineering/platform/issues/10807)) · Add show all versions toggle to card view options and implement version query filtering ([#10809](https://github.com/hcengineering/platform/issues/10809)) · To sort attributes for parent and sub class together ([#10816](https://github.com/hcengineering/platform/issues/10816)) · To copy controlled document content ([#10819](https://github.com/hcengineering/platform/issues/10819)) · Korean (ko) translation ([#10820](https://github.com/hcengineering/platform/issues/10820)) · Hide inactive employees ([#10821](https://github.com/hcengineering/platform/issues/10821)) · Array for relation ([#10827](https://github.com/hcengineering/platform/issues/10827))
* 🐛 BUG FIXES: · Link action ([#10793](https://github.com/hcengineering/platform/issues/10793)) · Tables ([#10813](https://github.com/hcengineering/platform/issues/10813)) · Label overflow ([#10829](https://github.com/hcengineering/platform/issues/10829)) · Docker build ([#10831](https://github.com/hcengineering/platform/issues/10831)) · Set migration state in case of mode mismatch and add duration ([#10801](https://github.com/hcengineering/platform/issues/10801))
* ⚙️ MISCELLANEOUS TASKS: · Changelog
## [0.7.423] - 2026-05-10
* 🚀 FEATURES: · Print documents by class and id ([#10753](https://github.com/hcengineering/platform/issues/10753)) · Add tool to create missing SocialIdentity ([#10758](https://github.com/hcengineering/platform/issues/10758)) · User statuses ([#10774](https://github.com/hcengineering/platform/issues/10774)) · Add ability to configure guest spaces in settings ([#10770](https://github.com/hcengineering/platform/issues/10770)) · Add min and max transformation functions ([#10782](https://github.com/hcengineering/platform/issues/10782)) · Add trigger to remove associated execution data when a card is deleted ([#10795](https://github.com/hcengineering/platform/issues/10795)) · Add found elements count in desktop ([#10799](https://github.com/hcengineering/platform/issues/10799))
+4 -4
View File
@@ -19097,10 +19097,10 @@ importers:
specifier: workspace:^0.7.423
version: link:../../packages/presentation
'@hcengineering/text':
specifier: workspace:^0.7.19
specifier: workspace:^0.7.423
version: link:../../foundations/core/packages/text
'@hcengineering/text-markdown':
specifier: workspace:^0.7.21
specifier: workspace:^0.7.423
version: link:../../foundations/core/packages/text-markdown
'@hcengineering/theme':
specifier: workspace:^0.7.423
@@ -24763,7 +24763,7 @@ importers:
specifier: workspace:^0.7.423
version: link:../setting-resources
'@hcengineering/text-core':
specifier: workspace:^0.7.19
specifier: workspace:^0.7.423
version: link:../../foundations/core/packages/text-core
'@hcengineering/time':
specifier: workspace:^0.7.423
@@ -61596,7 +61596,7 @@ snapshots:
node-loader@2.0.0(webpack@5.102.1):
dependencies:
loader-utils: 2.0.4
webpack: 5.102.1(esbuild@0.25.12)(webpack-cli@5.1.4)
webpack: 5.102.1
node-localstorage@2.2.1:
dependencies:
+11 -11
View File
@@ -41,17 +41,17 @@
"prettier-plugin-svelte": "^3.4.0"
},
"dependencies": {
"@hcengineering/platform": "workspace:^0.7.20",
"@hcengineering/core": "workspace:^0.7.26",
"@hcengineering/view": "workspace:^0.7.0",
"@hcengineering/converter": "workspace:^0.7.0",
"@hcengineering/presentation": "workspace:^0.7.0",
"@hcengineering/ui": "workspace:^0.7.0",
"@hcengineering/theme": "workspace:^0.7.0",
"@hcengineering/contact": "workspace:^0.7.0",
"@hcengineering/view-resources": "workspace:^0.7.0",
"@hcengineering/text": "workspace:^0.7.19",
"@hcengineering/text-markdown": "workspace:^0.7.21",
"@hcengineering/platform": "workspace:^0.7.423",
"@hcengineering/core": "workspace:^0.7.423",
"@hcengineering/view": "workspace:^0.7.423",
"@hcengineering/converter": "workspace:^0.7.423",
"@hcengineering/presentation": "workspace:^0.7.423",
"@hcengineering/ui": "workspace:^0.7.423",
"@hcengineering/theme": "workspace:^0.7.423",
"@hcengineering/contact": "workspace:^0.7.423",
"@hcengineering/view-resources": "workspace:^0.7.423",
"@hcengineering/text": "workspace:^0.7.423",
"@hcengineering/text-markdown": "workspace:^0.7.423",
"svelte": "^4.2.20"
}
}
+20 -20
View File
@@ -41,26 +41,26 @@
"typescript": "^5.9.3"
},
"dependencies": {
"@hcengineering/analytics": "workspace:^0.7.19",
"@hcengineering/contact-resources": "workspace:^0.7.0",
"@hcengineering/presentation": "workspace:^0.7.0",
"@hcengineering/setting-resources": "workspace:^0.7.0",
"@hcengineering/view": "workspace:^0.7.0",
"@hcengineering/view-resources": "workspace:^0.7.0",
"@hcengineering/card-resources": "workspace:^0.7.0",
"@hcengineering/calendar": "workspace:^0.7.0",
"@hcengineering/contact": "workspace:^0.7.0",
"@hcengineering/card": "workspace:^0.7.0",
"@hcengineering/workbench-resources": "workspace:^0.7.0",
"@hcengineering/core": "workspace:^0.7.26",
"@hcengineering/ui": "workspace:^0.7.0",
"@hcengineering/time": "workspace:^0.7.0",
"@hcengineering/rank": "workspace:^0.7.18",
"@hcengineering/platform": "workspace:^0.7.20",
"@hcengineering/process": "workspace:^0.7.0",
"@hcengineering/login": "workspace:^0.7.0",
"@hcengineering/text-core": "workspace:^0.7.19",
"@hcengineering/account-client": "workspace:^0.7.25",
"@hcengineering/analytics": "workspace:^0.7.423",
"@hcengineering/contact-resources": "workspace:^0.7.423",
"@hcengineering/presentation": "workspace:^0.7.423",
"@hcengineering/setting-resources": "workspace:^0.7.423",
"@hcengineering/view": "workspace:^0.7.423",
"@hcengineering/view-resources": "workspace:^0.7.423",
"@hcengineering/card-resources": "workspace:^0.7.423",
"@hcengineering/calendar": "workspace:^0.7.423",
"@hcengineering/contact": "workspace:^0.7.423",
"@hcengineering/card": "workspace:^0.7.423",
"@hcengineering/workbench-resources": "workspace:^0.7.423",
"@hcengineering/core": "workspace:^0.7.423",
"@hcengineering/ui": "workspace:^0.7.423",
"@hcengineering/time": "workspace:^0.7.423",
"@hcengineering/rank": "workspace:^0.7.423",
"@hcengineering/platform": "workspace:^0.7.423",
"@hcengineering/process": "workspace:^0.7.423",
"@hcengineering/login": "workspace:^0.7.423",
"@hcengineering/text-core": "workspace:^0.7.423",
"@hcengineering/account-client": "workspace:^0.7.423",
"svelte": "^4.2.20",
"fast-equals": "^5.2.2"
}