Merge branch 'openanalytics:master' into master

STATWORX · Apr 28, 2022 · 1c66388 · 1c66388
2 parents 9ff7d60 + 60de136
commit 1c66388
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>eu.openanalytics</groupId>
 	<artifactId>shinyproxy</artifactId>
-	<version>2.6.0</version>
+	<version>2.6.1</version>
 	<packaging>jar</packaging>
 
 	<name>ShinyProxy</name>
@@ -19,14 +19,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.12.RELEASE</version>
+		<version>2.5.12</version>
 		<relativePath />
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<containerproxy.version>0.8.10</containerproxy.version>
+		<containerproxy.version>0.8.11</containerproxy.version>
 		<resource.delimiter>&amp;</resource.delimiter>
 	</properties>
 

diff --git a/src/main/resources/fragments/navbar.html b/src/main/resources/fragments/navbar.html
@@ -67,7 +67,7 @@ <h4 class="modal-title">Report Issue</h4>
 						<div class="modal-body">
 							<div class="form-group">
 								<label for="customMessage"><span class="glyphicon glyphicon-chat"></span> Message to add to the report:</label>
-								<textarea class="form-control" id="customMessage" placeholder="Enter message" cols="40" rows="5"></textarea>
+								<textarea class="form-control" id="customMessage" placeholder="Enter message" cols="40" rows="5" name="customMessage"></textarea>
 								<input type="hidden" name="currentLocation"></input>
 							</div>
 						</div>