Merge branch 'tuakiri-develop'

* tuakiri-develop: Version: internal Tuakiri release 2.9.5-tuakiri3 EDController: fix allowedMethods settings (migrate) Grails2.5/EDController: fix allowedMethods settings Grails2.5: upgrade highcharts to 2.3.5 for jQuery 1.11.1 compatibility
REANNZ · Jul 19, 2020 · fb2aea9 · fb2aea9
2 parents 94d0db8 + ad6b652
commit fb2aea9
Show file tree

Hide file tree

Showing 5 changed files with 253 additions and 242 deletions.
diff --git a/app/federationregistry/application.properties b/app/federationregistry/application.properties
@@ -3,4 +3,4 @@
 app.grails.version=2.5.6
 app.name=federationregistry
 app.servlet.version=3.0
-app.version=2.9.5-tuakiri2
+app.version=2.9.5-tuakiri3
diff --git a/app/federationregistry/grails-app/conf/ApplicationResources.groovy b/app/federationregistry/grails-app/conf/ApplicationResources.groovy
@@ -59,7 +59,7 @@ modules = {
   'highcharts' {
     defaultBundle 'app'
 
-    resource url:'js/highcharts-2.2.5.js'
+    resource url:'js/highcharts-2.3.5.js'
   }
   'bootstrap-datepicker' {
     // Source: http://www.eyecon.ro/bootstrap-datepicker/