Commit 87f35bdc authored by malzer's avatar malzer
Browse files

Merge branch 'release/3.6.12'

parents 369546d7 900f4536
Bugfix Version 3.6.12
=====================
* Re-introduce excel MIME type to support CSVs exported from Excel
Bugfix Version 3.6.11
=====================
* Add bugtracking URLs also to german documentation
Bugfix Version 3.6.10 (September 16th 2021)
===========================================
......
......@@ -18,7 +18,7 @@ node {
// TODO: Set version number in the HTML pages, too! Decide between releases and snapshots!
// SNAPSHOTs are put into the SNAPSHOTS repo, releases and BETAs are put into the RELEASES repo!
package_version = '3.6.11'
package_version = '3.6.12'
name = 'dariahde-geobrowser'
description = 'DARIAH-DE Geo-Browser'
url = 'https://geobrowser.de.dariah.eu/'
......
......@@ -64,7 +64,7 @@ version = '2021-10-11'
# The full version, including alpha/beta/rc tags.
# Please put here the release date as release version!
release = '2021-10-11'
#release = '2021-09-16-BETA'
#release = '2021-10-11-BETA'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -253,7 +253,7 @@
</div> <!-- id="content-layout" -->
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Datasheet Editor version 3.6.11 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/index.html">&nbsp;</a></span>
<span>Datasheet Editor version 3.6.12 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/index.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
......@@ -17,8 +17,8 @@ const requiredColumnsGeolocation = ["Address", "Longitude", "Latitude", "GettyID
const requiredColumnsGeobrowser = ["Address", "TimeStamp", "TimeSpan:begin", "TimeSpan:end", "Longitude", "Latitude"];
// columns with date format
const dateColumns = ["TimeStamp", "TimeSpan:begin", "TimeSpan:end"];
// Mimetypes which pass check to get parsed into table.
var allowedMimeTypes = ["text/csv", "text/comma-separated-values", "application/vnd.dariahde.geobrowser.csv", "application/vnd.google-earth.kml+xml", "text/xml"]
// Mimetypes which pass check to get parsed into table. Excel is important to support CSVs exported from Excel!
var allowedMimeTypes = ["text/csv", "text/comma-separated-values", "application/vnd.ms-excel", "application/vnd.dariahde.geobrowser.csv", "application/vnd.google-earth.kml+xml", "text/xml"]
// CSV mimetype used for storing datasheets.
var csvStorageMimetype = 'application/vnd.dariahde.geobrowser.csv';
......
......@@ -118,7 +118,7 @@
</div> <!-- id="content-layout" -->
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Datasheet Editor version 3.6.11 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/list.html">&nbsp;</a></span>
<span>Datasheet Editor version 3.6.12 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/list.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
......@@ -77,5 +77,5 @@
});
</script>
</body>
<!-- Geo-Browser version 3.6.11 -->
<!-- Geo-Browser version 3.6.12 -->
</html>
......@@ -143,7 +143,7 @@
</div>
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Geo-Browser version 3.6.11 using <a href="https://github.com/DARIAH-DE/PLATIN">PLATIN</a> &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/index.html">&nbsp;</a></span>
<span>Geo-Browser version 3.6.12 using <a href="https://github.com/DARIAH-DE/PLATIN">PLATIN</a> &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/index.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment