Merge branch 'support/3.2' into develop

# Conflicts:
#	css/setup.css
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.css
#	package-lock.json
This commit is contained in:
Stephen Abello
2026-04-29 16:58:50 +02:00
179 changed files with 7748 additions and 303 deletions

View File

@@ -50,7 +50,10 @@ const CombodoCKEditorHandler = {
this.is_upload_configured[sElem] = false;
// create instance
return this.instances_promise[sElem] = new Promise((resolve, reject) => {
ClassicEditor.create($(sElem)[0], aConfiguration)
ClassicEditor.create(Object.assign({
attachTo: $(sElem)[0],
licenseKey: 'GPL',
}, aConfiguration))
.then(editor => {
// Adjust size if passed in configuration
// - Width