From 75f2df53d25cc7f637ccf1dbad61438c213f11b1 Mon Sep 17 00:00:00 2001 From: kate Date: Thu, 7 May 2020 15:50:55 +0200 Subject: [PATCH 01/20] adminlte upgrade to 2.4.18 --- gui/admin-gui/pom.xml | 4 ++-- .../evolveum/midpoint/gui/api/page/PageBase.html | 15 ++++++++------- .../evolveum/midpoint/gui/api/page/PageBase.java | 2 +- .../web/component/menu/SideBarMenuPanel.html | 2 +- .../evolveum/midpoint/web/page/PageDialog.html | 12 ++++++------ .../web/security/MidPointApplication.java | 2 +- pom.xml | 6 +++--- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml index 364faef3c7a..9265d61e0b7 100644 --- a/gui/admin-gui/pom.xml +++ b/gui/admin-gui/pom.xml @@ -106,8 +106,8 @@ runtime - org.webjars.bower - adminlte + org.webjars + AdminLTE runtime diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html index 6ec4f84b981..1a9266690aa 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html @@ -20,10 +20,10 @@ - + - + @@ -64,7 +64,7 @@