Merge branch 'develop' into 'add-webpack'

# Conflicts: # CHANGELOG.md # RELEASE.md # edit/index.html # edit/js/dariah.workflow.conf.js # edit/list.html # embed/index.html # index.html

Merge branch 'develop' into 'add-webpack'
# Conflicts: # CHANGELOG.md # RELEASE.md # edit/index.html # edit/js/dariah.workflow.conf.js # edit/list.html # embed/index.html # index.html
46c94ddf · malzer · 0c055e73 · c9a500fc · 46c94ddf · 46c94ddf
Commit 46c94ddf authored Nov 03, 2021 by malzer
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
-Version 4.0.0 (November 2021)
-===================
-Major internal changes: 
-* Introducing Webpack and setting version numbers automatically
-* Geobrowser modularization 
-
-Bugfix Version 3.6.9 (September 14th 2021)
-==========================================
+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)
+===========================================
+
+* Fix #81 (Datasheet nicht angezeigt)
+* Change bugtracking URLs in documentation to Gitlab
+* Add link to licenses to documentation
+
+
+Release Version 3.6.9 (September 14th 2021)
+===========================================

 * Update documentation
 * Fix #38: Add new version of Handsontable

--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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.10-BETA'
+    package_version = '3.6.13-BETA'
    name = 'dariahde-geobrowser'
    description = 'DARIAH-DE Geo-Browser'
    url = 'https://geobrowser.de.dariah.eu/'

--- a/docs/conf.py
+++ b/docs/conf.py
@@ -59,12 +59,12 @@ copyright = u'2021, DARIAH-DE'
 # NOTE: Please use "2021-SNAPSHOT" for snapshot deployment, and
 # "2021" (without suffix) for release deployment!
 version = '2021-BETA'
-#version = '2021'
+#version = '2021-10-11'

 # The full version, including alpha/beta/rc tags.
 # Please put here the release date as release version!
-#release = '2021-09-14'
-release = '2021-09-14-BETA'
+#release = '2021-10-11'
+release = '2021-10-11-BETA'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

--- a/docs/datasheet.rst
+++ b/docs/datasheet.rst
@@ -285,4 +285,4 @@ GIT Repository
 Bug Tracking
 ------------

-    * https://projects.gwdg.de/projects/geo-browser/work_packages
+    * https://gitlab.gwdg.de/dariah-de/geo-browser/-/issues
--- a/docs/de/datasheet.rst
+++ b/docs/de/datasheet.rst
@@ -279,4 +279,4 @@ GIT Repository
 Bug Tracking
 ------------

-    * https://projects.gwdg.de/projects/geo-browser/work_packages
+    * https://gitlab.gwdg.de/dariah-de/geo-browser/-/issues
--- a/docs/de/geobrowser.rst
+++ b/docs/de/geobrowser.rst
@@ -252,4 +252,4 @@ PLATIN-Fork vom DARIAH-DE Geo-Browser (hauptsächlich angepasste Konfiguration)
 Bugtracking
 -----------

-    * https://projects.gwdg.de/projects/geo-browser/work_packages
+    * https://gitlab.gwdg.de/dariah-de/geo-browser/-/issues
--- a/docs/geobrowser.rst
+++ b/docs/geobrowser.rst
@@ -256,4 +256,4 @@ PLATIN fork used in the DARIAH-DE Geo-Browser (mainly adapted configuration)
 Bug Tracking
 ------------

-    * https://projects.gwdg.de/projects/geo-browser/work_packages
+    * https://gitlab.gwdg.de/dariah-de/geo-browser/-/issues
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -29,6 +29,13 @@ Geo-Browser and Datasheet Editor
   Datasheet Editor FAQ [de] <./de/datasheet-faq>


+.. toctree::
+    :caption: Licenses
+
+    Geo-Browser and Datasheet Editor <https://gitlab.gwdg.de/dariah-de/geo-browser/-/blob/master/COPYING.LESSER>
+    PLATIN <https://github.com/DARIAH-DE/PLATIN/blob/master/COPYING.LESSER>
+
+
 .. toctree::
   :caption: Imprint and Privacy Policy