Merge remote-tracking branch 'origin/master' into feature/adminlte3-u…

…pgrade
Evolveum · Apr 13, 2022 · 8455b4b · 8455b4b
2 parents ea7efcb + c6f1625
commit 8455b4b
Show file tree

Hide file tree

Showing 26 changed files with 192 additions and 2,353 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -498,10 +498,6 @@
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiConstants.java
@@ -12,7 +12,4 @@ public class GuiConstants {
 
     public static final String NS_UI_PREFIX = SchemaConstants.NS_MIDPOINT_PUBLIC_PREFIX + "ui/";
     public static final String NS_UI_FEATURE = NS_UI_PREFIX + "feature";
-
-    public static final String DEFAULT_PATH_AFTER_LOGIN = "/self/dashboard";
-    public static final String DEFAULT_PATH_AFTER_LOGOUT = "/";
 }
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html