daniel
/
zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Merge branch 'release-2.1.7'

This commit is contained in:
Daniel Kraus 2015-10-02 11:22:44 +02:00
parent 9e39a7b868 7a92c7bc1e
commit ac8320b917
9 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
HISTORY.md
View File

@ -1,4 +1,12 @@
Version 2.1.6 (2015-09-25)
Version 2.1.7 (2015-10-02)
========================================================================
- VERBESSERT: Statt Sekretariatsmodus stand zweimal Ärztemodus im Begrüßungsbildschirm.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 2.1.6. (2015-09-27)
========================================================================
- VERBESSERT: Eingebaute Stile überarbeitet.

4
Tests/Tests.csproj
View File

@ -41,8 +41,8 @@
<AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Bovender, Version=0.3.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<HintPath>..\packages\Bovender.0.3.3.0\lib\net40\Bovender.dll</HintPath>
<Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<HintPath>..\packages\Bovender.0.4.0.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">

2
Tests/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Bovender" version="0.3.3.0" targetFramework="net40" />
<package id="Bovender" version="0.4.0.0" targetFramework="net40" />
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
</packages>

4
www/versioninfo.txt
View File

@ -1,4 +1,4 @@
2.1.6
2.1.7
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
f9277549cc0d74dafbb39f152719e4fdb2c31d5d publish/release/zaaReloaded-2.1.6.exe
e142c709482684790e8f5779b4313647d90e44fa publish/release/zaaReloaded-2.1.7.exe

2
zaaReloaded2/Formatter/DanielsStyle.cs
View File

@ -72,7 +72,7 @@ namespace zaaReloaded2.Formatter
find.Execute2007(FindText: "RR ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
find.Execute2007(FindText: "HF ", ReplaceWith: "", Replace: WdReplace.wdReplaceAll, MatchCase: true, MatchWholeWord: true);
find.Execute2007(FindText: "TAC-Spiegel", ReplaceWith: "Tacrolimus-Talspiegel", Replace: WdReplace.wdReplaceAll);
find.Execute2007(FindText: "ammelruin", ReplaceWith: "ammelurin", Replace: WdReplace.wdReplaceAll);
find.Execute2007(FindText: "ammelruin", ReplaceWith: "ammelurin", Replace: WdReplace.wdReplaceAll, MatchWholeWord: false);
find.Execute2007(FindText: "4-7", ReplaceWith: "4 bis 7", Replace: WdReplace.wdReplaceAll);
find.Execute2007(FindText: "5-8", ReplaceWith: "5 bis 8", Replace: WdReplace.wdReplaceAll);
find.Execute2007(FindText: "8-10", ReplaceWith: "8 bis 10", Replace: WdReplace.wdReplaceAll);

4
zaaReloaded2/VERSION
View File

@ -1,2 +1,2 @@
2.1.6
2.1.6.0
2.1.7
2.1.7.0

2
zaaReloaded2/Views/FirstRunView.xaml
View File

@ -51,7 +51,7 @@
<Button Height="40" DockPanel.Dock="Left" Command="{Binding SelectTypistsModeCommand}" Content="Sekretariatsmodus"
Width="160" Margin="0 0 10 0" VerticalAlignment="Center" />
<TextBlock TextWrapping="Wrap" VerticalAlignment="Center">
Im Ärztemodus werden beim Formatieren grundsätzlich keine Zusatzinformationen abgefragt.
Im Sekretariatsmodus werden beim Formatieren grundsätzlich keine Zusatzinformationen abgefragt.
</TextBlock>
</DockPanel>
<TextBlock TextWrapping="Wrap" Foreground="Gray">

2
zaaReloaded2/packages.config
View File

@ -19,6 +19,6 @@
limitations under the License.
-->
<packages>
<package id="Bovender" version="0.3.3.0" targetFramework="net40" />
<package id="Bovender" version="0.4.0.0" targetFramework="net40" />
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
</packages>

4
zaaReloaded2/zaaReloaded2.csproj
View File

@ -134,8 +134,8 @@
-->
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Bovender, Version=0.3.3.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<HintPath>..\packages\Bovender.0.3.3.0\lib\net40\Bovender.dll</HintPath>
<Reference Include="Bovender, Version=0.4.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
<HintPath>..\packages\Bovender.0.4.0.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" />