Merge branch '5.9.6'

JBEI · May 5, 2022 · d3539fd · d3539fd
2 parents c7d68c0 + 523759f
commit d3539fd
Show file tree

Hide file tree

Showing 22 changed files with 4,167 additions and 409 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.jbei</groupId>
     <artifactId>ice</artifactId>
     <packaging>war</packaging>
-    <version>5.9.5</version>
+    <version>5.9.6</version>
     <name>ice</name>
     <description>Inventory of Composable Elements (ICE) for Synthetic Biology</description>
     <repositories>

diff --git a/src/main/java/org/jbei/ice/lib/config/SiteSettings.java b/src/main/java/org/jbei/ice/lib/config/SiteSettings.java
@@ -9,7 +9,7 @@
  */
 public class SiteSettings implements IDataTransferModel {
 
-    private String version = "5.9.5";
+    private String version = "5.9.6";
     private String assetName;
     private boolean hasLogo;
     private boolean hasLoginMessage;

diff --git a/src/main/java/org/jbei/ice/lib/dto/ConfigurationKey.java b/src/main/java/org/jbei/ice/lib/dto/ConfigurationKey.java
@@ -11,7 +11,7 @@
  */
 public enum ConfigurationKey implements IDataTransferModel {
 
-    APPLICATION_VERSION("5.9.5"),
+    APPLICATION_VERSION("5.9.6"),
     TEMPORARY_DIRECTORY("/tmp"),
     DATA_DIRECTORY("data"),
 

diff --git a/src/main/webapp/index.htm b/src/main/webapp/index.htm
@@ -15,12 +15,12 @@
     <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500' rel='stylesheet' type='text/css'>
 
     <script src="scripts/lib/jquery-3.3.1.min.js"></script>
-    <script src="scripts/lib/angularjs-1.7.8/angular.min.js"></script>
-    <script src="scripts/lib/angularjs-1.7.8/angular-route.min.js"></script>
-    <script src="scripts/lib/angularjs-1.7.8/angular-resource.min.js"></script>
-    <script src="scripts/lib/angularjs-1.7.8/angular-cookies.min.js"></script>
-    <script src="scripts/lib/angularjs-1.7.8/angular-animate.min.js"></script>
-    <script src="scripts/lib/angularjs-1.7.8/angular-touch.min.js"></script>
+    <script src="scripts/lib/angular-1.8.2/angular.min.js"></script>
+    <script src="scripts/lib/angular-1.8.2/angular-route.min.js"></script>
+    <script src="scripts/lib/angular-1.8.2/angular-resource.min.js"></script>
+    <script src="scripts/lib/angular-1.8.2/angular-cookies.min.js"></script>
+    <script src="scripts/lib/angular-1.8.2/angular-animate.min.js"></script>
+    <script src="scripts/lib/angular-1.8.2/angular-touch.min.js"></script>
 
     <script src="scripts/lib/angular-ui/angular-ui-router.min-1.0.20.js"></script>
     <script src="scripts/lib/angular-ui/ui-bootstrap-tpls-2.5.0.min.js"></script>

diff --git a/...ib/angularjs-1.7.8/angular-animate.min.js → .../lib/angular-1.8.2/angular-animate.min.js b/...ib/angularjs-1.7.8/angular-animate.min.js → .../lib/angular-1.8.2/angular-animate.min.js
diff --git a/...s/lib/angularjs-1.7.8/angular-aria.min.js → ...pts/lib/angular-1.8.2/angular-aria.min.js b/...s/lib/angularjs-1.7.8/angular-aria.min.js → ...pts/lib/angular-1.8.2/angular-aria.min.js
diff --git a/...ib/angularjs-1.7.8/angular-cookies.min.js → .../lib/angular-1.8.2/angular-cookies.min.js b/...ib/angularjs-1.7.8/angular-cookies.min.js → .../lib/angular-1.8.2/angular-cookies.min.js
diff --git a/...lib/angularjs-1.7.8/angular-loader.min.js → ...s/lib/angular-1.8.2/angular-loader.min.js b/...lib/angularjs-1.7.8/angular-loader.min.js → ...s/lib/angular-1.8.2/angular-loader.min.js
diff --git a/...larjs-1.7.8/angular-message-format.min.js → ...gular-1.8.2/angular-message-format.min.js b/...larjs-1.7.8/angular-message-format.min.js → ...gular-1.8.2/angular-message-format.min.js