1061 Commits

Author SHA1 Message Date
ziti-ci 1a7a44e97c [ci skip] committing updated installer file 1.2.13 1.2.14 2020-11-02 00:27:59 +00:00
dovholuknf 8b256c11d9 Merge pull request #183 from openziti/release-1.2.14
Release 1.2.14
2020-11-01 19:13:23 -05:00
ziti-ci 83b58195b4 [ci skip] committing updated installer file 2020-11-02 00:12:35 +00:00
dovholuknf b823251f55 commit anyway... 2020-11-01 19:03:29 -05:00
dovholuknf 26d984810b trying to get the push to work 2020-11-01 17:29:25 -05:00
dovholuknf a7e3b0fe94 try testing for key using a full path 2020-11-01 17:13:34 -05:00
dovholuknf 566f2e3546 test for key and don't commit/push 2020-11-01 17:00:08 -05:00
dovholuknf e589c6156f annnnd need to push too.. 2020-11-01 16:53:19 -05:00
ziti-ci 5222d00d7d gah - put the git add at the right spot 2020-11-01 16:39:58 -05:00
ziti-ci fe30810703 move all the git adds to the installer build too 2020-11-01 16:28:15 -05:00
ziti-ci 3110b73a57 update scripts and only git commit from the installer build if ziti-ci 2020-11-01 16:22:53 -05:00
ziti-ci 70f61c4bb4 [ci skip] committing updated version information 2020-11-01 21:16:14 +00:00
ziti-ci 505ce9e720 Merge branch 'release-1.2.14' of github.com:openziti/desktop-edge-win into release-1.2.14 2020-11-01 16:07:29 -05:00
ziti-ci 2c8f94b19b update build scripts to update version of updater service as well as commit back if ziti-ci is the git user 2020-11-01 16:07:05 -05:00
ziti-ci 6d74f4d58e [ci skip] committing updated version information 2020-11-01 20:49:44 +00:00
ziti-ci bb4cf5ce9c updated version number 2020-11-01 15:40:35 -05:00
ziti-ci 306c9bdc4c update the way the installer is generated to use /setversion to allow in-place upgrading 2020-11-01 15:39:20 -05:00
ziti-ci 7e3daa0d67 [ci skip] committing updated version information 2020-11-01 20:25:46 +00:00
dovholuknf 6e3c1c76b4 Merge pull request #170 from openziti/release-1.2.13
Release 1.2.13
2020-11-01 15:13:43 -05:00
dovholuknf e113ef9b73 Merge pull request #182 from openziti/release-1.2.13-ui-tweaks
Improper Margin Placement and Sizing Issues
2020-11-01 15:06:00 -05:00
dovholuknf 2e0dd15fe5 Merge branch 'release-1.2.13' into release-1.2.13-ui-tweaks 2020-11-01 15:05:52 -05:00
ziti-ci 44cd67c1c2 [ci skip] committing updated version information 2020-11-01 19:58:58 +00:00
Jeremy Tellier - ROG fc4a059454 Merge branch 'release-1.2.13-ui-tweaks' of https://github.com/openziti/ziti-tunnel-win into release-1.2.13-ui-tweaks 2020-11-01 19:51:30 +00:00
Jeremy Tellier - ROG 319fa50417 Heights for Identity Details Screen 2020-11-01 19:50:57 +00:00
ziti-ci 776eacf639 [ci skip] committing updated version information 2020-11-01 19:28:58 +00:00
Jeremy Tellier - ROG 9a50a507e5 Merge branch 'release-1.2.13-ui-tweaks' of https://github.com/openziti/ziti-tunnel-win into release-1.2.13-ui-tweaks 2020-11-01 19:20:44 +00:00
Jeremy Tellier - ROG 17df375e77 Proper Height Positioning 2020-11-01 19:20:12 +00:00
ziti-ci 6dbad36414 [ci skip] committing updated version information 2020-11-01 18:11:17 +00:00
Jeremy Tellier - ROG 977c2420a3 Improper Margin Placement and Sizing Issues 2020-11-01 18:03:59 +00:00
ziti-ci d1b80856fb [ci skip] committing updated version information 2020-11-01 17:05:41 +00:00
dovholuknf e49e7c2015 Merge pull request #179 from openziti/release-1.2.13-ui-tweaks
Release 1.2.13 ui tweaks
2020-11-01 11:52:43 -05:00
Jeremy Tellier - ROG f5e991d801 Remove Orig Files 2020-11-01 16:51:47 +00:00
Jeremy Tellier - ROG 4a21ead271 Merge branch 'release-1.2.13-ui-tweaks' of https://github.com/openziti/ziti-tunnel-win into release-1.2.13-ui-tweaks
# Conflicts:
#	DesktopEdge/IdentityDetails.xaml
#	DesktopEdge/IdentityDetails.xaml.cs
2020-11-01 16:49:23 +00:00
Jeremy Tellier - ROG a00b75ed51 Ellipsis Cut off long title and add mouse over.
Fields read only.
2020-11-01 16:02:51 +00:00
ziti-ci 313acaac95 [ci skip] committing updated version information 2020-10-31 04:57:36 +00:00
ziti-ci 116f4807df tweak the dependency 2020-10-31 00:49:49 -04:00
ziti-ci d34c651129 Merge branch 'release-1.2.13' of github.com:openziti/desktop-edge-win into release-1.2.13 2020-10-31 00:48:59 -04:00
ziti-ci b203a2c179 update release-notes with updates 2020-10-31 00:48:52 -04:00
ziti-ci 148bb23e1d [ci skip] committing updated version information 2020-10-31 04:37:46 +00:00
dovholuknf d3a8a8216c Merge pull request #174 from openziti/release-1.2.13-tweaks
Release 1.2.13 tweaks
2020-10-31 00:30:48 -04:00
ziti-ci 88787cdb90 merge again 2020-10-31 00:29:50 -04:00
ziti-ci 282d9f52db Merge branch 'release-1.2.13-tweaks' of github.com:openziti/desktop-edge-win into release-1.2.13-tweaks 2020-10-31 00:28:59 -04:00
ziti-ci fcfa8a4857 add the controllerversion back 2020-10-31 00:28:39 -04:00
ziti-ci 07190a464c [ci skip] committing updated version information 2020-10-31 04:24:08 +00:00
ziti-ci 0d19ef40e1 fix overflow on detail page when the name is very very long 2020-10-31 00:15:09 -04:00
ziti-ci d539ff3ad0 [ci skip] committing updated version information 2020-10-31 04:03:31 +00:00
dovholuknf 0f80ce2715 Merge pull request #173 from openziti/release-1.2.13-tweaks
Release 1.2.13 tweaks
2020-10-30 23:53:57 -04:00
ziti-ci b6c2d09e72 merge release-1.2.13 2020-10-30 23:53:37 -04:00
ziti-ci 5fbd35282a Merge remote-tracking branch 'origin/issue-165-widen-interface' into release-1.2.13-tweaks 2020-10-30 23:35:07 -04:00
ziti-ci 77a027c882 Merge branch 'release-1.2.13-tweaks' of github.com:openziti/desktop-edge-win into release-1.2.13-tweaks 2020-10-30 23:35:04 -04:00