diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 05263e275..268b851a9 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -134,7 +134,7 @@ mysql mysql-connector-java - 5.1.36 + 5.1.42 net.sf.jga diff --git a/pom.xml b/pom.xml index d8de4fed8..2e13de235 100644 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,33 @@ -Xdoclint:none + + dependency-check + + + dependency-check + + + + + + org.owasp + dependency-check-maven + + true + true + + + + + check + + + + + + + release @@ -192,6 +219,11 @@ + + org.owasp + dependency-check-maven + 2.0.1 + maven-assembly-plugin 2.5.5 diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 381295575..d4987ed81 100644 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -424,6 +424,15 @@ /jenaAdmin + + DumpRestoreController + edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore.DumpRestoreController + + + DumpRestoreController + /dumpRestore/* + + EditFrontController edu.cornell.mannlib.vedit.controller.EditFrontController diff --git a/webapp/src/main/webapp/js/vitroUtils.js b/webapp/src/main/webapp/js/vitroUtils.js index 2eae74bb0..2156515a0 100644 --- a/webapp/src/main/webapp/js/vitroUtils.js +++ b/webapp/src/main/webapp/js/vitroUtils.js @@ -7,7 +7,7 @@ $(document).ready(function(){ // fade out welcome-message when user logs in jQuery.extend(this, i18nStrings); - jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500); + jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500, function() { jQuery('section#welcome-msg-container').remove(); }); // fade in flash-message when user logs out jQuery('section#flash-message').css('display', 'none').fadeIn(1500); diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl index 14b24ec11..0ce4bcf98 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl @@ -16,7 +16,9 @@ <#-- Default individual profile page template --> <#--@dumpAll /--> +<#include "individual-adminPanel.ftl">
> +
<#-- Image --> <#assign individualImage> @@ -34,7 +36,6 @@
- <#include "individual-adminPanel.ftl"> <#if individualProductExtensionPreHeader??> ${individualProductExtensionPreHeader}