diff --git a/.gitignore b/.gitignore index f0d36d9a4..ce4dc378c 100644 --- a/.gitignore +++ b/.gitignore @@ -257,3 +257,5 @@ /BeWoPlanerMobil/logs /Host/logs /.vs/BeWoGit/v15 +/ReportImp/DerKarrenSbd/obj/Debug +/ReportImp/DerKarrenSbd/obj/Release diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 8f6d75775..5cc301082 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -29,7 +29,7 @@ 3.5 - D:\Projects\beyondsoft\BeWoPlaner\Publish45\ + D:\Projects\beyondsoft\BeWoPlaner\PublishDev\ true Web true @@ -39,16 +39,16 @@ false true false - http://app.beyondsoft.de/sbd/ + http://app.beyondsoft.de/dev/ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.135 + 2.0.1.137 true publish.htm false true - 136 + 138 2.0.1.%2a false true @@ -565,6 +565,8 @@ ConfirmDemoDialog.xaml + + ProxyLoginView.xaml diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index f6318788f..939e64a26 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -1,8 +1,8 @@  - D:\Projects\beyondsoft\BeWoPlaner\Publish45\|D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish\ - http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/deploy/|http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/ + D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\ + http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/deploy/|http://fortis-bewoplaner.fortis-ev.org.local/|http://FOBP01.fortis-ev.org.local/ diff --git a/BeWo/BeWoApp.xaml b/BeWo/BeWoApp.xaml index 3359276a9..1bb13025c 100644 --- a/BeWo/BeWoApp.xaml +++ b/BeWo/BeWoApp.xaml @@ -8,7 +8,9 @@ xmlns:microsoftWindowsThemes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic" StartupUri="MainWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" ShutdownMode="OnExplicitShutdown"> + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" + mc:Ignorable="d" ShutdownMode="OnExplicitShutdown"> @@ -106,7 +108,7 @@ Reaktivieren - diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index d963e688e..9006428a3 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -207,7 +207,7 @@ namespace BeWo AppSettings.ShowAdvisedAttendedFlag = false; - String timeRecordingMenuName = "Zeiterfassung"; + String timeRecordingMenuName = ""; if (_Mandator != null) { @@ -493,9 +493,9 @@ namespace BeWo url += ".bewoplaner.de"; } } - if (url.IndexOf("/service") < 0) + if (url.IndexOf("/servicedev") < 0) { - url += "/service"; + url += "/servicedev"; } if (ServerAddress == "10.0.116.4") //LH Würzburg diff --git a/BeWo/MainControl.xaml b/BeWo/MainControl.xaml index a8142e274..cc9ceeed3 100644 --- a/BeWo/MainControl.xaml +++ b/BeWo/MainControl.xaml @@ -6,6 +6,7 @@ xmlns:localView="clr-namespace:BeWo.View" xmlns:r="clr-namespace:BeWo.Security" xmlns:BeWo="clr-namespace:BeWo" + xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup" Background="{DynamicResource ApplicationBackground}" SnapsToDevicePixels="True" RenderTransformOrigin="0.5,0.5" @@ -202,7 +203,7 @@ @@ -217,7 +218,7 @@ @@ -232,7 +233,7 @@ @@ -248,7 +249,7 @@ @@ -266,7 +267,7 @@ @@ -296,7 +297,7 @@ @@ -311,7 +312,7 @@ @@ -326,7 +327,7 @@ @@ -341,7 +342,7 @@ @@ -359,7 +360,7 @@ Click="button_CustomerTeam_Click" x:Name="button_CustomerTeam" Style="{StaticResource NavBarButton}" - Content="Kliententeams" + Content="{t:Translate Kliententeams}" Background="{StaticResource CustomerTeamContentBrush}" RenderTransformOrigin="0.5, 0.5" ImageSource="Ressources/Icons/UserGroupBusinessDisabled.png" Width="90"> @@ -375,7 +376,7 @@ - - + + --> +