Merge branch 'release-2.2.6'

HISTORY.md

@@ -1,3 +1,21 @@
+Version 2.2.6 (2017-02-23)
+------------------------------------------------------------------------
+
+- Repariert: Stilauswahl wurde immer ganz im Vordergrund dargestellt und verdeckte damit mitunter andere Hinweise.
+- Verbessert: Diverse technische Verbesserungen.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.5 (2016-10-03)
+------------------------------------------------------------------------
+
+- Repariert: Word bleibt nicht mehr hängen, wenn man versucht, ein Dokument zu speichern.
+- Verbessert: Multiple Verbesserungen im Programmcode.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.2.4 (2016-04-05)
 ------------------------------------------------------------------------
 

Makefile

@@ -0,0 +1,29 @@
+SHELL=/bin/bash
+.PHONY=all help release upload website versioninfo
+
+help:
+	# Available targets:
+	# website     - update website on server
+	# versioninfo - create versioninfo file for the current release
+	# upload      - upload release files to server
+	# release     - all of the above
+
+all: versioninfo upload website
+	#
+	# Check repository status!
+	# 
+
+versioninfo:
+	head -n 1 zaaReloaded2/VERSION | tr -d '\r' > www/versioninfo.tmp
+	chmod 644 www/versioninfo.tmp
+	echo 'https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$$VERSION.exe' >> www/versioninfo.tmp
+	sha256sum deploy/releases/zaaReloaded-$$(head -n 1 zaaReloaded2/VERSION | tr -d '\r').exe >> www/versioninfo.tmp
+	echo '' >> www/versioninfo.tmp
+	todos www/versioninfo.tmp
+	mv www/versioninfo.tmp www/versioninfo.txt
+
+upload:
+	rsync -ruvz --progress deploy/releases/* doktorkraus.de:/var/www/html/zaareloaded/downloads/
+
+website:
+	rsync -ruvz www/ doktorkraus.de:/var/www/html/zaareloaded/

Tests/Tests.csproj

@@ -41,8 +41,8 @@
     <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Bovender, Version=0.14.5.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.14.5.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">

Tests/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bovender" version="0.14.5.0" targetFramework="net40" />
+  <package id="Bovender" version="0.16.2.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NLog" version="4.3.7" targetFramework="net40" />
   <package id="NUnit" version="3.4.1" targetFramework="net40" />

zaaReloaded2/VERSION

@@ -1,2 +1,2 @@
-2.2.5
+2.2.6
-2.2.5.0
+2.2.6.0

zaaReloaded2/Views/SettingsRepositoryView.xaml

@@ -23,8 +23,8 @@
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
-        Width="340" Height="370" Topmost="True"
+        Width="480" Height="340"
-        MinWidth="370" MinHeight="380" WindowStyle="ToolWindow"
+        MinWidth="420" MinHeight="340" WindowStyle="ToolWindow"
         ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Stil auswählen"

zaaReloaded2/packages.config

@@ -19,7 +19,7 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.14.5.0" targetFramework="net40" />
+  <package id="Bovender" version="0.16.2.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NLog" version="4.3.7" targetFramework="net40" />
   <package id="YamlDotNet.Signed" version="3.9.0" targetFramework="net40" />

zaaReloaded2/zaaReloaded2.csproj

@@ -134,8 +134,8 @@
   -->
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Bovender, Version=0.14.5.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.14.5.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />