ownSoft/Chat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lyndon Jetten
2021-02-25 12:33:16 +01:00
parent 7377dd30d1 c61f6abdb4
commit f707884585
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChatController/ChatController.csproj
View File

@@ -45,8 +45,8 @@
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\PrototypChat\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
<Reference Include="RestSharp">
<HintPath>..\libs\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

2
ChatController/ChatKlassen/ChatMessage.cs
View File

@@ -192,7 +192,7 @@ namespace ChatController.ChatKlassen
return new Uri("http://" + UserMessage);
}
if(UserMessage.Contains("https"))
if(UserMessage.Contains("https") || UserMessage.Contains("http"))
{
return new Uri(UserMessage);
}

2
ChatController/LoginControl.xaml.cs
View File

@@ -79,7 +79,7 @@ namespace ChatController
private string _Benutzername = string.Empty;
private string _ChatCode = string.Empty;
private string _Kundennummer = string.Empty;
private readonly string _Version = "1.3";
private readonly string _Version = "1.5";
public string Version => $"Version: {_Version}";

13
PrototypChat/PrototypChat.csproj
View File

@@ -25,11 +25,11 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>true</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<InstallUrl>http://app.beyondsoft.de/ownChat/</InstallUrl>
<InstallUrl>http://app.beyondsoft.de/ownChat/test/</InstallUrl>
<ProductName>ownChat Desktop</ProductName>
<PublisherName>beyondSoft GmbH</PublisherName>
<MinimumRequiredVersion>1.0.0.13</MinimumRequiredVersion>
<ApplicationRevision>14</ApplicationRevision>
<MinimumRequiredVersion>1.0.0.25</MinimumRequiredVersion>
<ApplicationRevision>26</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -56,7 +56,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>D9ACF3EBC5E47956B8D786361F7061E3F6D6F286</ManifestCertificateThumbprint>
<ManifestCertificateThumbprint>D7D02C6BE66C484058796E17BD368F3C81B4AA88</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>
@@ -66,15 +66,12 @@
<GenerateManifests>true</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>false</SignManifests>
<SignManifests>true</SignManifests>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>ownchat_favicon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\libs\Newtonsoft.Json.dll</HintPath>
</Reference>

2
PrototypChat/PrototypChat.csproj.user
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<EnableSecurityDebugging>false</EnableSecurityDebugging>
<PublishUrlHistory>D:\Projects\beyondSoft\Chat\publish\</PublishUrlHistory>
<InstallUrlHistory>http://app.beyondsoft.de/ownChat/|https://app5.bewoplaner.de/chat/</InstallUrlHistory>
<InstallUrlHistory>http://app.beyondsoft.de/ownChat/test/|http://app.beyondsoft.de/ownChat/|https://app5.bewoplaner.de/chat/</InstallUrlHistory>
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />