Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/Chat

ChatController/ChatKlassen/ChatMessage.cs

@@ -191,6 +191,11 @@ namespace ChatController.ChatKlassen
                     {
                         return new Uri("http://" + UserMessage);
                     }
+
+                    if(UserMessage.Contains("https"))
+                    {
+                        return new Uri(UserMessage);
+                    }
                 }
 
                 return null;

ChatController/ChatMainControl.xaml

@@ -299,10 +299,10 @@
                                                 </StackPanel>
                                                 <StackPanel DockPanel.Dock="Bottom"  Visibility="{Binding HyperlinkVisibility}" >
                                                     <TextBlock>
-                                                    <Hyperlink  NavigateUri="{Binding UserMessageAsUri}" RequestNavigate="Hyperlink_OnRequestNavigate" >
-                                                        <TextBlock  VerticalAlignment="Center" Text="{Binding UserMessage}" MinWidth="0" MaxWidth="{Binding MessageMaxWidth}" TextWrapping="Wrap" FontSize="14"/> 
-                                                    </Hyperlink>
-                                                </TextBlock>
+                                                        <Hyperlink  NavigateUri="{Binding UserMessageAsUri}" RequestNavigate="Hyperlink_OnRequestNavigate" >
+                                                            <TextBlock VerticalAlignment="Center" Text="{Binding UserMessage}" MinWidth="0" MaxWidth="{Binding MessageMaxWidth}" TextWrapping="Wrap" FontSize="14"/> 
+                                                        </Hyperlink>
+                                                    </TextBlock>
                                                 </StackPanel>
                                                 <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding PictureVisibility}" >
                                                     <StackPanel Orientation="Vertical">

ChatController/ChatMainControl.xaml.cs

@@ -947,7 +947,8 @@ namespace ChatController
 
         private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         {
-            Process.Start(e.Uri.ToString());
+            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
+            e.Handled = true;
         }
 
         private void ButtonReloadGruppen_OnClick(object sender, RoutedEventArgs e)

ChatController/HauptKlassen/Login.cs

@@ -406,8 +406,6 @@ namespace ChatController.HauptKlassen
 
             client.PostAsync(request, (response, handle) =>
             {
-                Debug.WriteLine(response.Content);
-
                 var connectionData = JsonConvert.DeserializeObject<UserDaten>(response.Content);
 
                 if (connectionData.Success)

ChatController/Resource.Designer.cs

@@ -107,7 +107,7 @@ namespace ChatController {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Office Dokumente und Bilder |*.doc;*.docx;*.xls;*.ppt;*.txt;*.pdf;*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp.
+        ///   Looks up a localized string similar to Office Dokumente und Bilder |*.doc;*.docx;*.xls;*.xlsx;*.ppt;*.pptx;*.txt;*.pdf;*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp.
         /// </summary>
         public static string OpenFileDialogFilter_Test {
             get {

ChatController/Resource.resx

@@ -161,6 +161,6 @@
     <value>ownChatNewMessageSync.txt</value>
   </data>
     <data name="OpenFileDialogFilter_Test" xml:space="preserve">
-        <value>Office Dokumente und Bilder |*.doc;*.docx;*.xls;*.ppt;*.txt;*.pdf;*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp</value>
+        <value>Office Dokumente und Bilder |*.doc;*.docx;*.xls;*.xlsx;*.ppt;*.pptx;*.txt;*.pdf;*.jpg;*.png;*.jpeg;*.jpe;*.gif;*.bmp</value>
     </data>
 </root>

ChatController/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="RestSharp" version="105.2.3" targetFramework="net45" />
+</packages>

PrototypChat/PrototypChat.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=ChatController_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

PrototypChat/packages/RestSharp.105.2.3/readme.txt

@@ -0,0 +1,20 @@
+*** IMPORTANT CHANGE IN RESTSHARP VERSION 103 ***
+
+In 103.0, JSON.NET was removed as a dependency. 
+
+If this is still installed in your project and no other libraries depend on 
+it you may remove it from your installed packages.
+
+There is one breaking change: the default Json*Serializer* is no longer 
+compatible with Json.NET. To use Json.NET for serialization, copy the code 
+from https://github.com/restsharp/RestSharp/blob/86b31f9adf049d7fb821de8279154f41a17b36f7/RestSharp/Serializers/JsonSerializer.cs 
+and register it with your client:
+
+var client = new RestClient();
+client.JsonSerializer = new YourCustomSerializer();
+
+The default Json*Deserializer* is mostly compatible, but it does not support
+all features which Json.NET has (like the ability to support a custom [JsonConverter]
+by decorating a certain property with an attribute). If you need these features, you
+must take care of the deserialization yourself to get it working.
+