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

Merge branch 'release-v2.3.2' into develop

This commit is contained in:
daniel 2017-03-06 06:20:32 +01:00
parent cc0573c326 b417107d33
commit 6a7508bca0
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
HISTORY.md
View File

@ -1,3 +1,11 @@
Version 2.3.2 (2017-03-06)
------------------------------------------------------------------------
- Repariert: Willkommensdialog mit der Auswahl des Modus wurde technisch nicht gut angezeigt.
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Version 2.3.1 (2017-03-03) Version 2.3.1 (2017-03-03)
------------------------------------------------------------------------ ------------------------------------------------------------------------

6
Tests/Controller/SettingsRepositoryTest.cs
View File

@ -27,18 +27,18 @@ namespace Tests.Controller
[TestFixture] [TestFixture]
class SettingsRepositoryTest class SettingsRepositoryTest
{ {
string _savedSettings; SettingsRepository _savedRepository;
[SetUp] [SetUp]
public void SetUp() public void SetUp()
{ {
_savedSettings = zaaReloaded2.UserSettings.Default.SettingsRepository; _savedRepository = zaaReloaded2.UserSettings.Default.SettingsRepository;
} }
[TearDown] [TearDown]
public void TearDown() public void TearDown()
{ {
zaaReloaded2.UserSettings.Default.SettingsRepository = _savedSettings; zaaReloaded2.UserSettings.Default.SettingsRepository = _savedRepository;
zaaReloaded2.UserSettings.Default.Save(); zaaReloaded2.UserSettings.Default.Save();
} }

4
www/versioninfo.txt
View File

@ -1,4 +1,4 @@
2.3.1 2.3.2
https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
21c3a526191ec71fe8681a447b54d2447de4e69c54e44d1ab27d6fbf2a05f7c3 deploy/releases/zaaReloaded-2.3.1.exe 49d8383326222a88ce447a7c97eba596ffd5782f307f8730ffac83743821949f deploy/releases/zaaReloaded-2.3.2.exe

2
zaaReloaded2/ThisAddIn.cs
View File

@ -95,7 +95,7 @@ namespace zaaReloaded2
{ {
_dispatcher.Invoke((Action)(() => ViewModels.FirstRunViewModel.InjectIntoIfNeeded<Views.FirstRunView>()), null); _dispatcher.Invoke((Action)(() => ViewModels.FirstRunViewModel.InjectIntoIfNeeded<Views.FirstRunView>()), null);
}, null, 1000, System.Threading.Timeout.Infinite); }, null, 500, System.Threading.Timeout.Infinite);
Logger.Info("ThisAddIn_Startup: Finished startup"); Logger.Info("ThisAddIn_Startup: Finished startup");
} }

4
zaaReloaded2/VERSION
View File

@ -1,2 +1,2 @@
2.3.1 2.3.2
2.3.1.0 2.3.2.0