1090 Commits

Author SHA1 Message Date
ziti-ci c75a1d65ac [ci skip] committing updated installer file 1.3.0 2020-11-02 04:49:15 +00:00
dovholuknf a36eaf21b6 Merge pull request #176 from openziti/release-1.3.0
release-1.3.0
2020-11-01 23:39:18 -05:00
ziti-ci 52f14c548b [ci skip] committing updated installer file 2020-11-02 04:37:03 +00:00
dovholuknf 87dc6f384a Merge pull request #181 from openziti/issue-180-monitor-updates
Issue 180 monitor updates
2020-11-01 23:29:17 -05:00
dovholuknf 82176383d8 hopefully autoupdate works now 2020-11-01 23:22:20 -05:00
dovholuknf be16392571 wip auto-update 2020-11-01 23:03:59 -05:00
dovholuknf 06eade3c1e tweak the installer and add missing using statement back to service 2020-11-01 20:21:24 -05:00
dovholuknf 297681fb7e merge and update build script to not commit/push if not a release branch 2020-11-01 20:06:09 -05:00
dovholuknf 0a9f11fa45 merge release-1.3.0 2020-11-01 19:49:44 -05:00
ziti-ci 381874b5a1 [ci skip] committing updated installer file 2020-11-02 00:43:24 +00:00
dovholuknf 9facdf7664 merge master in 2020-11-01 19:34:28 -05:00
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 fc43ab5d66 merge 1.2.14 to 1.3.0 2020-11-01 17:08:24 -05:00
dovholuknf 776af9d453 merge release-1.2.14 2020-11-01 17:06:01 -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
ziti-ci 5d4731db74 set the monitor to startup at install 2020-11-01 15:12:43 -05:00
ziti-ci 4fb7796b36 wip commit 2020-11-01 15:10:10 -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 376fd6d6ca tired of fighting VS line endings -> CRLF 2020-11-01 12:28:34 -05:00
ziti-ci 477bb1b645 add the iputil in case it's needed later 2020-11-01 12:22:39 -05:00
ziti-ci 19a02bdf53 Merge remote-tracking branch 'origin/release-1.3.0' into issue-180-monitor-updates 2020-11-01 12:21:36 -05:00
ziti-ci 0de8a9dc29 minor tweaks to the UI code. extract the service client to a library to use in both projects. start impl 2020-11-01 12:21:22 -05:00
ziti-ci 39d6f4a205 ziti service cleanup commented out code and minor bug fixes 2020-11-01 12:12:25 -05:00
ziti-ci d1b80856fb [ci skip] committing updated version information 2020-11-01 17:05:41 +00:00