Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/BasicsCoding/Hawkchat
Browse files Browse the repository at this point in the history
  • Loading branch information
Connor W committed Dec 31, 2017
2 parents 1a5a183 + 2ae7778 commit 4d40257
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
9 changes: 7 additions & 2 deletions Hawkchat/Client/Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -167,4 +168,8 @@
<None Include="Resources\profile-default-male.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions Hawkchat/Client/MainWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,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();
Expand Down
6 changes: 5 additions & 1 deletion Hawkchat/Server/Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 4d40257

Please sign in to comment.