Jeremy Tellier - ROG 92f8d1c0db Merge branch 'release-next' into mfa-timeout-ui ...

# Conflicts:
#	DesktopEdge/ZitiDesktopEdge.csproj

2021-07-29 21:49:47 +01:00

..

Assets

Merge branch 'release-next' into mfa-timeout-ui

2021-07-29 21:49:47 +01:00

Models

Using LastUpdateTime calculate the timeout on the service to see if the warning should be displayed.

2021-07-21 13:44:58 +01:00

Native

one clean commit with all mfa fixes

2021-03-11 12:42:27 -05:00

Properties

[ci skip] committing updated version related files

2021-07-22 15:58:25 +00:00

Themes

Style Changes, Broke Remove Id

2020-07-31 22:06:03 +01:00

Utils

fix issue with UI log not writing debug/trace logs when debugging

2021-03-23 23:12:54 -04:00

Views

Merge branch 'release-next' into mfa-timeout-ui

2021-07-29 21:49:47 +01:00

App.config

Scrollbar mouse to 1 item, Set height to show at least one identity, resize on resolution downgrade, new menu list of identities.

2021-01-26 02:41:23 +00:00

app.manifest

more renames

2020-07-08 14:27:22 -04:00

App.xaml

New Layout for Details.

2021-04-16 21:54:08 +01:00

App.xaml.cs

Add Toast and upgrade package manager

2021-07-02 21:24:38 +01:00

MainWindow.xaml

Update Alert UIs.

2021-07-02 20:02:48 +01:00

MainWindow.xaml.cs

Merge branch 'release-next' into mfa-timeout-ui

2021-07-29 21:49:47 +01:00

ziti.ico

more renames

2020-07-08 14:27:22 -04:00

ZitiDesktopEdge-log.config

one clean commit with all mfa fixes

2021-03-11 12:42:27 -05:00

ZitiDesktopEdge.csproj

Merge branch 'release-next' into mfa-timeout-ui

2021-07-29 21:49:47 +01:00