diff --git a/DesktopEdge/Assets/Images/update.png b/DesktopEdge/Assets/Images/update.png
new file mode 100644
index 00000000..4a846972
Binary files /dev/null and b/DesktopEdge/Assets/Images/update.png differ
diff --git a/DesktopEdge/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml
index d2472688..a94fea10 100644
--- a/DesktopEdge/IdentityDetails.xaml
+++ b/DesktopEdge/IdentityDetails.xaml
@@ -51,7 +51,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs
index e18d255f..fc488d92 100644
--- a/DesktopEdge/IdentityDetails.xaml.cs
+++ b/DesktopEdge/IdentityDetails.xaml.cs
@@ -24,6 +24,7 @@ namespace ZitiDesktopEdge {
public delegate void Detched(MouseButtonEventArgs e);
public event Detched OnDetach;
public double MainHeight = 500;
+ public string filter = "";
private List identities {
get {
@@ -83,14 +84,18 @@ namespace ZitiDesktopEdge {
IdentityStatus.Value = _identity.IsEnabled ? "active" : "disabled";
ServiceList.Children.Clear();
if (_identity.Services.Count>0) {
+ Filter.Visibility = Visibility.Visible;
+ FilterLabel.Visibility = Visibility.Visible;
foreach(var zitiSvc in _identity.Services.OrderBy(s => s.Name.ToLower())) {
- Logger.Debug("painting: " + zitiSvc.Name);
- ServiceInfo editor = new ServiceInfo();
- editor.Label = zitiSvc.Name;
- editor.Value = zitiSvc.Url;
- editor.Warning = zitiSvc.Warning;
- editor.IsLocked = true;
- ServiceList.Children.Add(editor);
+ if (zitiSvc.Name.ToLower().IndexOf(filter)>=0||zitiSvc.Url.ToLower().IndexOf(filter)>=0) {
+ Logger.Debug("painting: " + zitiSvc.Name);
+ ServiceInfo editor = new ServiceInfo();
+ editor.Label = zitiSvc.Name;
+ editor.Value = zitiSvc.Url;
+ editor.Warning = zitiSvc.Warning;
+ editor.IsLocked = true;
+ ServiceList.Children.Add(editor);
+ }
}
double newHeight = MainHeight - 300;
ServiceRow.Height = new GridLength((double)newHeight);
@@ -99,6 +104,8 @@ namespace ZitiDesktopEdge {
MainDetailScroll.Visibility = Visibility.Visible;
ServiceTitle.Content = _identity.Services.Count + " SERVICES";
} else {
+ Filter.Visibility = Visibility.Collapsed;
+ FilterLabel.Visibility = Visibility.Collapsed;
ServiceRow.Height = new GridLength((double)0.0);
MainDetailScroll.Visibility = Visibility.Collapsed;
ServiceTitle.Content = "NO SERVICES AVAILABLE";
@@ -158,5 +165,24 @@ namespace ZitiDesktopEdge {
OnError(ex.Message);
}
}
+
+ private void FilterServices(object sender, KeyEventArgs e) {
+ if (e.Key == Key.Return) {
+ DoFilter();
+ }
+ }
+
+ private void DoFilter() {
+ filter = Filter.Text.ToLower().Trim();
+ UpdateView();
+ }
+
+ private void FilterClicked(object sender, MouseButtonEventArgs e) {
+ DoFilter();
+ }
+
+ private void FilterBlur(object sender, RoutedEventArgs e) {
+ DoFilter();
+ }
}
}
diff --git a/DesktopEdge/MainMenu.xaml b/DesktopEdge/MainMenu.xaml
index 0d2fe879..e64030aa 100644
--- a/DesktopEdge/MainMenu.xaml
+++ b/DesktopEdge/MainMenu.xaml
@@ -53,7 +53,7 @@
-
+
@@ -67,10 +67,24 @@
-
-
-
-
+
+
+
+
+
+
diff --git a/DesktopEdge/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs
index 5c8715da..eed45d94 100644
--- a/DesktopEdge/MainMenu.xaml.cs
+++ b/DesktopEdge/MainMenu.xaml.cs
@@ -6,11 +6,9 @@ using System;
using System.Reflection;
using System.Net.Mail;
using System.IO;
-using System.Net;
-using Newtonsoft.Json.Linq;
using ZitiDesktopEdge.ServiceClient;
-
using NLog;
+
using ZitiDesktopEdge.DataStructures;
using ZitiDesktopEdge.Native;
using System.Configuration;
@@ -118,11 +116,10 @@ namespace ZitiDesktopEdge {
bool releaseClicked = opt.Label.ToLower() == "stable";
- SvcResponse r = null;
if (releaseClicked) {
if (isBeta) {
//toggle to stable
- r = await monitorClient.SetReleaseStreamAsync("stable");
+ var r = await monitorClient.SetReleaseStreamAsync("stable");
checkResponse(r, "Error When Setting Release Stream", "An error occurred while trying to set the release stream.");
} else {
logger.Debug("stable clicked but already on stable stream");
@@ -130,16 +127,14 @@ namespace ZitiDesktopEdge {
} else {
if (!isBeta) {
//toggle to beta
- r = await monitorClient.SetReleaseStreamAsync("beta");
+ var r = await monitorClient.SetReleaseStreamAsync("beta");
checkResponse(r, "Error When Setting Release Stream", "An error occurred while trying to set the release stream.");
} else {
logger.Debug("beta clicked but already on beta stream");
}
}
- if (r != null) {
- Application.Current.Properties["ReleaseStream"] = opt.Label.ToLower();
- UpdateState();
- }
+ Application.Current.Properties["ReleaseStream"] = opt.Label.ToLower();
+ UpdateState();
}
private void checkResponse(SvcResponse r, string titleOnErr, string msgOnErr) {
@@ -279,7 +274,7 @@ namespace ZitiDesktopEdge {
try {
MainWindow.ShowLoad("Collecting Information", "Please wait while we run some commands\nand collect some diagnostic information");
DataClient client = (DataClient)Application.Current.Properties["ServiceClient"];
- var mailMessage = new MailMessage("ziti-support@netfoundry.io", "ziti-support@netfoundry.io");
+ var mailMessage = new MailMessage("help@openziti.org", "help@openziti.org");
mailMessage.Subject = "Ziti Support";
mailMessage.IsBodyHtml = false;
System.Text.StringBuilder sb = new System.Text.StringBuilder();
diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs
index 0cacaaa1..c734582a 100644
--- a/DesktopEdge/Properties/AssemblyInfo.cs
+++ b/DesktopEdge/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@ using System.Windows;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.6.24.0")]
-[assembly: AssemblyVersion("1.6.24.0")]
-[assembly: AssemblyFileVersion("1.6.24.0")]
+// [assembly: AssemblyVersion("1.6.25.0")]
+[assembly: AssemblyVersion("1.6.25.0")]
+[assembly: AssemblyFileVersion("1.6.25.0")]
diff --git a/DesktopEdge/ZitiDesktopEdge.csproj b/DesktopEdge/ZitiDesktopEdge.csproj
index 870084b6..c1cc295e 100644
--- a/DesktopEdge/ZitiDesktopEdge.csproj
+++ b/DesktopEdge/ZitiDesktopEdge.csproj
@@ -89,7 +89,7 @@
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.7.5\lib\net45\NLog.dll
+ ..\packages\NLog.4.7.6\lib\net45\NLog.dll
@@ -378,5 +378,8 @@
ZitiDesktopEdge.Client
+
+
+
\ No newline at end of file
diff --git a/DesktopEdge/packages.config b/DesktopEdge/packages.config
index 9001a312..4539b443 100644
--- a/DesktopEdge/packages.config
+++ b/DesktopEdge/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip
index c94ed1a1..8395b28b 100644
--- a/Installer/ZitiDesktopEdge.aip
+++ b/Installer/ZitiDesktopEdge.aip
@@ -22,10 +22,10 @@
|
|
|
- |
+ |
|
|
- |
+ |
|
|
|
diff --git a/ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj b/ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj
index 379bf357..b093c37d 100644
--- a/ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj
+++ b/ZitiDesktopEdge.Client/ZitiDesktopEdge.Client.csproj
@@ -36,7 +36,7 @@
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.7.5\lib\net45\NLog.dll
+ ..\packages\NLog.4.7.6\lib\net45\NLog.dll
diff --git a/ZitiDesktopEdge.Client/packages.config b/ZitiDesktopEdge.Client/packages.config
index 17631c80..8a7eb305 100644
--- a/ZitiDesktopEdge.Client/packages.config
+++ b/ZitiDesktopEdge.Client/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs
index 8c8c88ea..9ad18429 100644
--- a/ZitiUpdateService/Properties/AssemblyInfo.cs
+++ b/ZitiUpdateService/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.6.24.0")]
-[assembly: AssemblyVersion("1.6.24.0")]
-[assembly: AssemblyFileVersion("1.6.24.0")]
+// [assembly: AssemblyVersion("1.6.25.0")]
+[assembly: AssemblyVersion("1.6.25.0")]
+[assembly: AssemblyFileVersion("1.6.25.0")]
diff --git a/ZitiUpdateService/ZitiUpdateService.csproj b/ZitiUpdateService/ZitiUpdateService.csproj
index a80cadf4..dde15518 100644
--- a/ZitiUpdateService/ZitiUpdateService.csproj
+++ b/ZitiUpdateService/ZitiUpdateService.csproj
@@ -80,7 +80,7 @@
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.7.5\lib\net45\NLog.dll
+ ..\packages\NLog.4.7.6\lib\net45\NLog.dll
diff --git a/ZitiUpdateService/packages.config b/ZitiUpdateService/packages.config
index bba3d6da..04f986fe 100644
--- a/ZitiUpdateService/packages.config
+++ b/ZitiUpdateService/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/release-notes.md b/release-notes.md
index db209dd4..887e313d 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,63 @@
+# Release 1.6.25
+
+## What's New
+* Filtering is now available on the detail page of identities
+
+## Other changes:
+* none
+
+## Bugs fixed:
+* [#287](https://github.com/openziti/desktop-edge-win/issues/287) - access fileshare via UNC path in Windows explorer very slow
+
+## Dependency Updates
+* updated TSDK/CSDK to v0.7.26.1
+* updated .net logging to NLog 4.7.6
+
+# Release 1.6.24
+
+## What's New
+* fixes to c sdk to better handle when the controller is unavailable at startup
+
+## Other changes:
+* none
+
+## Bugs fixed:
+* none
+
+## Dependency Updates
+* updated TSDK/CSDK to v0.7.26/0.18.7
+
+# Release 1.6.23
+
+## What's New
+* fixes to c sdk to better handle when the controller is unavailable at startup
+
+## Other changes:
+* none
+
+## Bugs fixed:
+* none
+
+## Dependency Updates
+* updated TSDK/CSDK to v0.7.26/0.18.7
+
+# Release 1.6.22
+
+## What's New
+* fixes [#274](https://github.com/openziti/desktop-edge-win/issues/274) - Added logging to all SC calls into the monitor service
+* feedback now collects systeminfo and dnscache info
+* added a "please wait" to the feedback option
+
+## Other changes:
+* none
+
+## Bugs fixed:
+* stability fixes when the monitor service is down the UI should not crash when trying to access the monitor service
+* stability fixes from tsdk/csdk
+
+## Dependency Updates
+* updated TSDK/CSDK to v0.7.25/0.18.6
+
# Release 1.6.20
## What's New
diff --git a/service/build.bat b/service/build.bat
index ee9b5386..481983d7 100644
--- a/service/build.bat
+++ b/service/build.bat
@@ -14,7 +14,7 @@ REM See the License for the specific language governing permissions and
REM limitations under the License.
REM
SET REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c.git
-SET ZITI_TUNNEL_REPO_BRANCH=v0.7.26
+SET ZITI_TUNNEL_REPO_BRANCH=v0.7.26.1
REM override the c sdk used in the build - leave blank for the same as specified in the tunneler sdk
SET ZITI_SDK_C_BRANCH=
REM the number of TCP connections the tunneler sdk can have at any one time
diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go
index 9dd0a32f..9829fee5 100644
--- a/service/ziti-tunnel/version.go
+++ b/service/ziti-tunnel/version.go
@@ -20,9 +20,9 @@
package main
const (
- Version = "1.6.24"
- Revision = "8fff18ede7dc"
- Branch = "master"
+ Version = "1.6.25"
+ Revision = "520a9788f433"
+ Branch = "release-1.6.25"
BuildUser = ""
- BuildDate = "2020-12-23 13:32:35"
+ BuildDate = "2021-01-08 16:12:45"
)
diff --git a/version b/version
index 4ad1e55e..a92834b0 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.6.24
+1.6.25