Merge branch 'master' into dev10
This commit is contained in:
commit
111263ba91
@ -33,7 +33,7 @@ class common {
|
|||||||
const TEMP_DIR = 'site/tmp/';
|
const TEMP_DIR = 'site/tmp/';
|
||||||
|
|
||||||
// Numéro de version
|
// Numéro de version
|
||||||
const ZWII_VERSION = '10.0.043';
|
const ZWII_VERSION = '10.0.044';
|
||||||
const ZWII_UPDATE_CHANNEL = "v10";
|
const ZWII_UPDATE_CHANNEL = "v10";
|
||||||
|
|
||||||
public static $actions = [];
|
public static $actions = [];
|
||||||
|
5
core/vendor/tinymce/init.js
vendored
5
core/vendor/tinymce/init.js
vendored
@ -191,6 +191,11 @@ tinymce.init({
|
|||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Suppression du back ground TinyMCE
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
$(body).removeAttr("background-image");
|
||||||
|
|
||||||
|
|
||||||
tinymce.PluginManager.add('stickytoolbar', function(editor, url) {
|
tinymce.PluginManager.add('stickytoolbar', function(editor, url) {
|
||||||
|
Loading…
Reference in New Issue
Block a user