Merge branch 'release/5.7.0'

geobtaa · May 8, 2024 · e44c623 · e44c623
2 parents f1ad7bc + 3391dde
commit e44c623
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ public/sitemap.xml*
 public/blog/*
 public/thumbnails/*
 public/uploads/*
+public/derivatives/*
 
 # Ignore public/uploads
 public/uploads/*

diff --git a/README.md b/README.md
@@ -30,4 +30,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport
 
 #### Release Version
 
-B1G Geoportal Version v5.6.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (vite branch)
+B1G Geoportal Version v5.7.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (vite branch)
diff --git a/app/views/shared/_footer_app.html.haml b/app/views/shared/_footer_app.html.haml
@@ -7,7 +7,10 @@
           = link_to "News &amp; Updates".html_safe, 'https://geobtaa.blogspot.com'
         %li
           = link_to "About Us", 'https://gin.btaa.org'
+        %li
+          %a{href:'https://gin.btaa.org/library/harmful-language/'} Harmful Language Statement
         %li
           %a{href:'https://geo.btaa.org/feedback'} Contact Project Team
         %li
           %a{href:'http://www.btaa.org'} Big Ten Academic Alliance Homepage
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,4 @@ Visit the [project wiki](https://github.com/BTAA-Geospatial-Data-Project/geoport

		#### Release Version

		B1G Geoportal Version v5.6.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (vite branch)
		B1G Geoportal Version v5.7.0 / GeoBlacklight v4.4.0 / GeoBlacklight Admin v0.4.1 (vite branch)