Merge branch 'master' of https://github.com/BasicsCoding/Hawkchat

cxnky · Dec 31, 2017 · 2ae7778 · 2ae7778
2 parents 02aa22f + 59af201
commit 2ae7778
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: csharp
+solution: Hawkchat/Hawkchat.sln
+install: 
+  - sudo apt-get install -y gtk-sharp2
+  - nuget restore Hawkchat/Hawkchat.sln
+notifications:
+  webhooks: 
+    urls: 
+      - https://blackhawksoftware.net/software/hawkchat/travis.php
+    on_success: always
+    on_failure: always
+    on_start: change
+    on_cancel: always
+    on_error: always
diff --git a/Hawkchat/Client/Client.csproj b/Hawkchat/Client/Client.csproj
@@ -59,8 +59,9 @@
     <Reference Include="SimpleTCP, Version=1.0.24.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SimpleTCP.1.0.24\lib\net45\SimpleTCP.dll</HintPath>
     </Reference>
-    <Reference Include="SUF">
-      <HintPath>..\..\..\..\..\Desktop\SUF.dll</HintPath>
+    <Reference Include="SUF, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>.\SUF.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -166,4 +167,8 @@
     <None Include="Resources\profile-default-male.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/Hawkchat/Client/MainWindow.cs b/Hawkchat/Client/MainWindow.cs
@@ -140,9 +140,9 @@ private void btnSendMessage_Click(object sender, EventArgs e)
         {
 
             // send to a test account
-            // flow:
+            // flow: 
             // client -> want to establish connection to <id> -> server gets that IP and port and forwards it back -> p2p
-            string toAccountID = "93605610";
+            string toAccountID = "23948739";
             string message = txtMessage.Text.Trim();
 
             dynamic json = new JObject();

diff --git a/Hawkchat/Client/SUF.dll b/Hawkchat/Client/SUF.dll
diff --git a/Hawkchat/Server/SUF.dll b/Hawkchat/Server/SUF.dll
diff --git a/Hawkchat/Server/Server.csproj b/Hawkchat/Server/Server.csproj
@@ -47,7 +47,7 @@
       <HintPath>..\packages\SimpleTCP.1.0.24\lib\net45\SimpleTCP.dll</HintPath>
     </Reference>
     <Reference Include="SUF">
-      <HintPath>..\..\..\..\..\Desktop\SUF.dll</HintPath>
+      <HintPath>.\SUF.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -93,4 +93,8 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.106.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
-# Hawkchat
+# Hawkchat ![(https://travis-ci.com/BasicsCoding/Hawkchat.svg?token=EoFg2i6UUmDvuy2KynqG&branch=master)](https://travis-ci.com/BasicsCoding/Hawkchat.svg?token=EoFg2i6UUmDvuy2KynqG&branch=master)
 Encrypted chat system with numerous features, e.g. buddy system, emoji support etc