Merge branch '2.4' into develop

2022-05-05 15:56:22 +02:00 · 2022-05-05 15:56:22 +02:00 · 33be2f3cf4
parent e13b410d67 5d86dd0f80
commit 33be2f3cf4
3 changed files with 20374 additions and 0 deletions
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@ -14,6 +14,7 @@
            'font-awesome',
            'chosen.min',
            'main',
+            'jquery-ui',
            array('print', array('media' => 'print'))
        );
        if (Configure::read('MISP.custom_css')) {
@ -23,6 +24,7 @@
            'jquery',
            'misp-touch',
            'chosen.jquery.min',
+            'jquery-ui'
        );
        echo $this->element('genericElements/assetLoader', array(
            'css' => $css_collection,
--- a/app/webroot/css/jquery-ui.css
+++ b/app/webroot/css/jquery-ui.css
--- a/app/webroot/js/jquery-ui.js
+++ b/app/webroot/js/jquery-ui.js