Merge pull request #280 from gyselroth/v3.2.x

v3.2.11
gyselroth · Nov 13, 2019 · e39bdb1 · e39bdb1
2 parents cad31f5 + 8386d2c
commit e39bdb1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 3.2.11
+**Maintainer**: balloon-team <opensource@gyselroth.net>\
+**Date**: Wed Nov 13 10:39:43 CET 2019
+
+### Bugfixes
+
+* Desktop client popup provides outdated url to the documentation #279
+
+### Common
+
+* Starting with v3.2.11 the changelog has a new format, all changes get splitted into sub categeories within the changelog to get a better readability. Note
+for debian pkg changelog the issues get merged in a single list.
+
+
 ## 3.2.10
 **Maintainer**: balloon-team <opensource@gyselroth.net>\
 **Date**: Fri Nov 08 09:39:33 CET 2019

diff --git a/Makefile b/Makefile
@@ -101,13 +101,17 @@ $(CHANGELOG_TARGET): CHANGELOG.md
 	@v=""
 	@stable="stable"
 	@author=""
+	@category=""
 	@date=""
 	@changes=""
 	@-test ! -f $@ || rm $@
 
 	@while read l; \
 	do \
-		if [ "$${l:0:2}" == "##" ]; \
+		if [ "$${l:0:3}" == "###" ]; \
+		then \
+			category=$${l:4}; \
+		elif [ "$${l:0:2}" == "##" ]; \
 		then \
 	 		if [ "$$v" != "" ]; \
 	 		then \

diff --git a/src/app/Balloon.App.DesktopClient/locale/de.json b/src/app/Balloon.App.DesktopClient/locale/de.json
@@ -10,7 +10,7 @@
       "redhat": "RPM based (.rpm)",
       "download": "Download",
       "hint": "Es gibt eine App, welche deine ganze Cloud auf deinen Desktop bringt. Die App gibt es für Windows, Mac OS X und Linux. Du kannst diese herunterladen, indem du auf {icon-app-download} klickst unten links.",
-      "documentation": "In der <a target='_blank' href='https://balloons.readthedocs.io/en/latest/desktop-client'>Dokumentation (EN)</a> sind weitere Instruktionen wie der Desktop-Client unter Linux von Paketquellen installiert werden kann."
+      "documentation": "In der <a target='_blank' href='https://gyselroth.github.io/balloon-docs/desktop-client/installation'>Dokumentation (EN)</a> sind weitere Instruktionen wie der Desktop-Client unter Linux von Paketquellen installiert werden kann."
     }
   }
 }
diff --git a/src/app/Balloon.App.DesktopClient/locale/en.json b/src/app/Balloon.App.DesktopClient/locale/en.json
@@ -10,7 +10,7 @@
       "redhat": "RPM based (.rpm)",
       "download": "Download",
       "hint": "There is full featured desktop client app which brings your cloud to your desktop. The desktop client is available for Windows, Mac OS X and Linux. You can get if you hit the icon {icon-app-download} on the bottom left.",
-      "documentation": "Also see the desktop client installation <a target='_blank' href='https://balloons.readthedocs.io/en/latest/desktop-client'>documentation</a> if you want further information or instructions how to install the desktop client on Linux via package sources."
+      "documentation": "Also see the desktop client installation <a target='_blank' href='https://gyselroth.github.io/balloon-docs/desktop-client/installation'>documentation</a> if you want further information or instructions how to install the desktop client on Linux via package sources."
     }
   }
 }