Skip to content

Commit d55f2bd

Browse files
authored
Merge pull request #1817 from AtlasOfLivingAustralia/hotfix/8.2.1
Hotfix/8.2.1
2 parents b699586 + 20f3b05 commit d55f2bd

File tree

7 files changed

+12
-6
lines changed

7 files changed

+12
-6
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ assets {
209209
minifyOptions = [
210210
languageMode : 'ES6', //languageIn
211211
// targetLanguage: 'ES5', // languageOut
212-
excludes: ['sw.js', '**/*.min.js', 'ckeditor/ckeditor5/**']
212+
excludes: ['sw.js', '**/*.min.js', 'ckeditor/ckeditor5/**', '**/webjars/**']
213213
]
214214

215215
includes = []

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
biocollectVersion=8.2
1+
biocollectVersion=8.2.1-SNAPSHOT
22
grailsVersion=6.2.0
33
grailsGradlePluginVersion=6.1.2
44
assetPipelineVersion=4.3.0
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
//= require webjars/underscore/1.13.4/underscore
2+
//= require ala-map-jquery-plugins
3+
//= require ala-map-leaflet
4+
//= require ala-map-leaflet-deps
5+
//= require ala-map-urijs
6+
//= require ala-map-no-deps

grails-app/assets/javascripts/base-bs4.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
//= require bootstrap4/js/bootstrap.bundle.min.js
1010
// = require bootstrap4/js/bootstrap.bundle.js
1111
//= require bootstrap-combobox/js/bootstrap-combobox.js
12-
//= require ala-map-no-jquery-us.js
12+
//= require ala-map-no-jquery-us-no-handlebars.js
1313
//= require fieldcapture-application.js

grails-app/assets/javascripts/leaflet-manifest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//= require leaflet/Control.FullScreen
77

88
// from ala-map-plugin
9-
//= require ala-map-no-jquery-us //without jquery 2
9+
//= require ala-map-no-jquery-us-no-handlebars //without jquery 2
1010

1111
//= require MapUtilities.js
1212
//= require siteDisplay.js

grails-app/assets/javascripts/pwa-manifest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//= require bootbox/bootbox.min.js
66
//= require utils.js
77
//= require dexiejs/dexie.js
8-
//= require ala-map-no-jquery-us.js
8+
//= require ala-map-no-jquery-us-no-handlebars.js
99
//= require MapUtilities.js
1010
//= require entities.js
1111
//= require modals.js

grails-app/views/project/_aboutCitizenScienceProject.gsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
</div>
343343
<!-- /ko -->
344344
<g:if test="${hubConfig.content?.showCustomMetadata}">
345-
<!-- ko if:customMetadata.indigenousCulturalIP -->
345+
<!-- ko if:customMetadata.indigenousCulturalIP() === "Yes" -->
346346
<div class="row">
347347
<div class="col-12">
348348
<p><g:message code="project.details.indigenousCulturalIP.acknowledgementText"/></p>

0 commit comments

Comments
 (0)