Skip to content

Commit 79897ac

Browse files
committed
Merge branch '2025.4' into 2026.1
2 parents 66b5750 + 8e11615 commit 79897ac

23 files changed

Lines changed: 1248 additions & 62 deletions

File tree

Lines changed: 5 additions & 0 deletions
Loading

assets/js/src/core/modules/data-object/listing/decorator/column-configuration/view-layer/components/grid/hooks/use-grid-options/tabs/grid-config/forms/advanced-column-form/preview/preview-value.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const PreviewValue = (props: PreviewValueProps): React.JSX.Element => {
4040
type: isAdvancedCellType ? item.type : 'dataobject.adapter',
4141
config: {
4242
...(isAdvancedCellType
43-
? {}
43+
? { renderAsHtml: true }
4444
: {
4545
dataObjectType: item.type,
4646
dataObjectConfig: {}

assets/js/src/core/modules/icon-library/index.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ import txtDocs from '@Pimcore/assets/icons/txt-docs.inline.svg?react'
372372
import unknown from '@Pimcore/assets/icons/unknown.inline.svg?react'
373373
import unlinkDocument from '@Pimcore/assets/icons/unlink-document.inline.svg?react'
374374
import unlocked from '@Pimcore/assets/icons/unlocked.inline.svg?react'
375+
import updateBuild from '@Pimcore/assets/icons/update-build.inline.svg?react'
375376
import uploadCloud from '@Pimcore/assets/icons/upload-cloud.inline.svg?react'
376377
import uploadImport from '@Pimcore/assets/icons/upload-import.inline.svg?react'
377378
import uploadZip from '@Pimcore/assets/icons/upload-zip.inline.svg?react'
@@ -1826,6 +1827,10 @@ moduleSystem.registerModule({
18261827
name: 'unlocked',
18271828
component: unlocked
18281829
})
1830+
iconLibrary.register({
1831+
name: 'update-build',
1832+
component: updateBuild
1833+
})
18291834
iconLibrary.register({
18301835
name: 'upload-cloud',
18311836
component: uploadCloud

public/build/3fd507af-46ea-4d01-980e-857a62b74def/documentEditorIframe.html

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/3fd507af-46ea-4d01-980e-857a62b74def/main.html

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/3fd507af-46ea-4d01-980e-857a62b74def/mf-manifest.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/3fd507af-46ea-4d01-980e-857a62b74def/mf-stats.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)