835 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
dovholuknf	5a04e8fefe	Merge branch 'release-1.2.11' of github.com:openziti/desktop-edge-win into release-1.2.11	2020-10-20 08:02:06 -04:00
dovholuknf	77983c3b95	forgot to call the update script	2020-10-20 08:01:58 -04:00
ziti-ci	1a5b39100b	[ci skip] committing updated version information	2020-10-20 12:01:31 +00:00
dovholuknf	72a37a0bb9	update travis file - should build on anything that isn't the 'installer' branch	2020-10-20 07:55:21 -04:00
dovholuknf	d096cda0de	update version update information	2020-10-20 07:49:59 -04:00
dovholuknf	a3d5654a27	remove trailing lines from AssemblyInfo.cs	2020-10-20 07:44:37 -04:00
dovholuknf	f93b55d436	replacing content in a file should not be this hard with powershell...	2020-10-20 07:44:12 -04:00
dovholuknf	164a00e35e	update version line by line to see if it will stop adding newlines	2020-10-20 00:04:07 -04:00
dovholuknf	56ec6eccee	don't append newlines over and over	2020-10-19 23:35:48 -04:00
dovholuknf	a4a60bc0ab	build pre-releases for testing	2020-10-19 23:16:55 -04:00
dovholuknf	c7914ac210	bump to 1.2.11	2020-10-19 23:15:37 -04:00
dovholuknf	925b005ce2	Merge branch 'release-1.2.10' of github.com:openziti/desktop-edge-win into release-1.2.10	2020-10-19 23:13:36 -04:00
dovholuknf	144c074e15	truing all the branches to the pre-release branch	2020-10-19 23:13:28 -04:00
ziti-ci	ae27dfc8ca	[ci skip] committing updated version information	2020-10-20 03:11:42 +00:00
dovholuknf	aa0474a469	Merge pull request #141 from openziti/issue-130-upgrade-detection ... Issue 130 upgrade version detection	2020-10-19 23:06:06 -04:00
dovholuknf	2d7dc9e062	Merge pull request #139 from openziti/fix-ips-treated-as-dns ... change dns timeout to debug not warning	2020-10-19 23:05:31 -04:00
dovholuknf	f035917ca7	good enough without the version baked in automatically for now...	2020-10-19 14:49:35 -04:00
dovholuknf	4b8e4995ed	another try	2020-10-19 14:42:06 -04:00
dovholuknf	774786475d	another try	2020-10-19 14:14:34 -04:00
dovholuknf	cbb41a7c1d	another try	2020-10-19 13:59:11 -04:00
dovholuknf	2a89f9ea9e	another try	2020-10-19 13:53:44 -04:00
dovholuknf	31b02d2b57	another try	2020-10-19 13:48:39 -04:00
dovholuknf	58b53191ac	another try	2020-10-19 13:36:03 -04:00
dovholuknf	5c4a644f2b	another try	2020-10-19 13:27:37 -04:00
dovholuknf	c2a7bb1ba7	another try	2020-10-19 13:26:57 -04:00
dovholuknf	021d7758dc	another try	2020-10-19 13:21:14 -04:00
dovholuknf	5707f6b538	another try	2020-10-19 13:19:37 -04:00
dovholuknf	ba8bee720d	another try	2020-10-19 13:18:55 -04:00
dovholuknf	c4020bb992	another try	2020-10-19 13:18:06 -04:00
dovholuknf	b91e847249	another try	2020-10-19 13:17:06 -04:00
dovholuknf	4e56846746	another try	2020-10-19 13:06:56 -04:00
dovholuknf	f28439c501	another try	2020-10-19 13:01:09 -04:00
dovholuknf	5d37ff59e0	another try	2020-10-19 11:09:07 -04:00
dovholuknf	db2a8662ec	another try	2020-10-19 11:05:39 -04:00
dovholuknf	205f0491d5	add a bat file to register adv installer	2020-10-19 11:04:55 -04:00
dovholuknf	44c36d6dbf	another try	2020-10-19 10:58:45 -04:00
dovholuknf	eb694c3647	another try	2020-10-19 09:20:51 -04:00
dovholuknf	87baf472c8	another try	2020-10-19 09:17:01 -04:00
dovholuknf	e66e126f46	another try	2020-10-19 08:41:32 -04:00
dovholuknf	c711c3645e	another try	2020-10-19 08:40:26 -04:00
dovholuknf	3e657e080a	another try	2020-10-19 08:38:52 -04:00
dovholuknf	1c92a735b0	another try	2020-10-19 08:32:52 -04:00
dovholuknf	8d59bb3880	another try	2020-10-19 08:29:49 -04:00
dovholuknf	439c5b932e	another try	2020-10-19 08:27:54 -04:00
dovholuknf	59cc1bbced	another try	2020-10-19 08:16:16 -04:00
dovholuknf	16ff3275d2	another try	2020-10-19 08:14:52 -04:00
dovholuknf	fc5334106b	another try	2020-10-19 08:09:14 -04:00
dovholuknf	d68200e0ae	another try	2020-10-19 08:01:21 -04:00
dovholuknf	34ccea6bd9	another try	2020-10-19 07:58:51 -04:00
dovholuknf	4ca1b55348	try more	2020-10-19 07:53:34 -04:00