Merge branch 'master' into _bootstrap_modal

This commit is contained in:
2021-04-14 09:49:46 +02:00
146 changed files with 11043 additions and 649 deletions

View File

@@ -7,9 +7,8 @@ buildCKEditor = function(encore)
.addPlugin( new CKEditorWebpackPlugin( {
language: 'fr',
addMainLanguageTranslationsToAllAssets: true,
verbose: true,
strict: true,
//additionalLanguages: ['en', 'nl', 'es'],
verbose: !encore.isProduction(),
strict: true
} ) )
// Use raw-loader for CKEditor 5 SVG files.
@@ -35,7 +34,7 @@ buildCKEditor = function(encore)
} )
} )
;
}
};
// Compile and loads all assets from the Chill Main Bundle
module.exports = function(encore, entries)
@@ -61,8 +60,8 @@ module.exports = function(encore, entries)
encore.addEntry('bootstrap', __dirname + '/Resources/public/modules/bootstrap/index.js');
// CKEditor5
//buildCKEditor(encore);
//encore.addEntry('ckeditor5', __dirname + '/Resources/public/modules/ckeditor5/index.js');
buildCKEditor(encore);
encore.addEntry('ckeditor5', __dirname + '/Resources/public/modules/ckeditor5/index.js');
};
};