Commit 369546d7 authored by malzer's avatar malzer
Browse files

Merge branch 'release/3.6.11'

parents 707aa65c 9703b86b
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.10'
package_version = '3.6.11'
name = 'dariahde-geobrowser'
description = 'DARIAH-DE Geo-Browser'
url = 'https://geobrowser.de.dariah.eu/'
......@@ -34,8 +34,8 @@ node {
git clone https://github.com/DARIAH-DE/PLATIN.git
# FIXME: Remove develop checkout if releasing!!!
# cd PLATIN && git checkout develop && rake all
cd PLATIN && rake all
cd PLATIN && git checkout master && rake all
# cd PLATIN && rake all
echo "===> Preparing doc building"
umask 0022
......
......@@ -60,4 +60,4 @@ Afterwards:
* Increase version and add “-BETA“ in all above mentioned files.
git commit -am "New SNAPSHOT version 3.6.10-BETA"
git push origin develop mater --tags
git push origin develop master --tags
......@@ -59,11 +59,11 @@ 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-09-16'
version = '2021-10-11'
# The full version, including alpha/beta/rc tags.
# Please put here the release date as release version!
release = '2021-09-16'
release = '2021-10-11'
#release = '2021-09-16-BETA'
# The language for content autogenerated by Sphinx. Refer to documentation
......
......@@ -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
......@@ -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
......@@ -253,7 +253,7 @@
</div> <!-- id="content-layout" -->
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Datasheet Editor version 3.6.10 &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.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>
<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>
......
......@@ -118,7 +118,7 @@
</div> <!-- id="content-layout" -->
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Datasheet Editor version 3.6.10 &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.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>
<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.10 -->
<!-- Geo-Browser version 3.6.11 -->
</html>
......@@ -143,7 +143,7 @@
</div>
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Geo-Browser version 3.6.10 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.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>
<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