composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 18:18:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
Benjamin Dalsass
2024-06-04 10:59:39 +02:00
parent 7bfa23fab7 fbf98aa4d9
commit 55ed552ba7
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/datamodel.core.xml
View File

@@ -126,7 +126,7 @@
<field id="message" xsi:type="AttributeText">
<sql>message</sql>
<default_value/>
<is_null_allowed>true</is_null_allowed>
<is_null_allowed>false</is_null_allowed>
</field>
<field id="icon" xsi:type="AttributeImage">
<sql>icon</sql>

2
js/ckeditor/build/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
js/ckeditor/build/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

2
js/ckeditor/src/ckeditor.ts
View File

@@ -146,7 +146,7 @@ class Editor extends ClassicEditor {
},
'-',
'link',
'object-shortcut',
// 'object-shortcut',
'imageUpload',
'blockQuote',
'codeBlock',