Commit Graph

2794 Commits

Author SHA1 Message Date
David Sparer
b686bc1112 Update mRemoteNGTests.csproj
removed unit test I accidentally re-added
2017-11-06 10:17:33 -06:00
David Sparer
25bee76fff Merge branch 'develop' into MR-225_Can_not_import_RDCMan_v2.7 2017-11-06 10:14:35 -06:00
David Sparer
98a8b9944e Merge branch 'develop' into MR-225_Can_not_import_RDCMan_v2.7 2017-11-06 10:09:49 -06:00
Bruce Peterson
66745d2ddf Correcting Merge conflicts with TESTS project file. 2017-11-06 10:15:10 -05:00
Bruce Peterson
cf9e1fe54c Attempting to correct merge conflicts 2017-11-06 09:56:10 -05:00
David Sparer
9bf59bed2f update jenkins build tools paths 2017-11-06 08:08:49 -06:00
David Sparer
32a1dd64ab Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.TXT
#	CREDITS.TXT
#	README.MD
#	Tools/postbuild_installer.ps1
#	Tools/set_LargeAddressAware.ps1
#	mRemoteNGTests/mRemoteNGTests.csproj
#	mRemoteNGTests/packages.config
#	mRemoteV1/App/Logger.cs
#	mRemoteV1/App/Runtime.cs
#	mRemoteV1/App/Startup.cs
#	mRemoteV1/Connection/DefaultConnectionInfo.cs
#	mRemoteV1/Connection/Protocol/IntegratedProgram.cs
#	mRemoteV1/Connection/Protocol/PuttyBase.cs
#	mRemoteV1/Messages/MessageCollector.cs
#	mRemoteV1/Properties/AssemblyInfo.cs
#	mRemoteV1/Resources/Language/Language.Designer.cs
#	mRemoteV1/Resources/PuTTYNG.exe
#	mRemoteV1/Tools/ConnectionsTreeToMenuItemsConverter.cs
#	mRemoteV1/Tools/ExternalToolArgumentParser.cs
#	mRemoteV1/Tools/IeBrowserEmulation.cs
#	mRemoteV1/Tools/NotificationAreaIcon.cs
#	mRemoteV1/Tools/PortScanner.cs
#	mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
#	mRemoteV1/UI/Controls/ConnectionTree/NameColumn.cs
#	mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
#	mRemoteV1/UI/Forms/frmMain.cs
#	mRemoteV1/UI/Window/AboutWindow.cs
#	mRemoteV1/UI/Window/PortScanWindow.cs
2017-11-03 11:15:20 -05:00
David Sparer
93d7ef48eb removed unnecessary specflow file 2017-10-30 15:30:06 -05:00
Sean Kaim
a90b7abff7 proper xml formatting 2017-10-30 15:10:08 -04:00
Sean Kaim
a479b4b109 fix line terminators 2017-10-30 14:57:40 -04:00
Sean Kaim
326e1118da more nuget package updates 2017-10-30 14:57:29 -04:00
Sean Kaim
90f1e324ce update gecko 2017-10-30 14:39:20 -04:00
Sean Kaim
41e0228c03 re-target for .net 4.6 2017-10-30 13:42:26 -04:00
Sean Kaim
e72691a164 Merge pull request #760 from brucetp/MR-747_PuttySessions.Watcher.StartWatching_failed._Not_found
MR-747 putty sessions.watcher.start watching failed. not found
2017-10-30 12:28:24 -04:00
Bruce Peterson
7b1d2a0b38 Attempting to start Putty FileSystemWatcher on a folder that doesn't exist. 2017-10-30 12:03:21 -04:00
David Sparer
470d76faab added another valid microsoft cert thumbprint 2017-10-30 10:30:03 -05:00
Sean Kaim
aec9a75bba additional log adjustments 2017-10-30 11:27:43 -04:00
Sean Kaim
fcbac22577 add some details to StackTrace messages 2017-10-30 11:23:29 -04:00
Bruce Peterson
1153a5dd3c Putty config file path was incorrectly parsed 2017-10-30 11:22:26 -04:00
David Sparer
04fccad19c removed jenkins build step to publish test reports
they seem ot be failing a lot lately and its really not worth the trouble
2017-10-29 17:41:49 -05:00
David Sparer
1bce756bd6 Merge pull request #742 from mRemoteNG/revert_credmanager
Reverted credential manager functionality
2017-10-29 17:30:29 -05:00
David Sparer
68f052efcb Merge branch 'hotfix10' v1.75.7010 2017-10-29 12:44:53 -05:00
David Sparer
4a8baf79fb bumped assembly version 2017-10-29 12:44:18 -05:00
David Sparer
499ac0295e fixed one case where visible connection tree width wasnt being updated correctly 2017-10-29 12:33:29 -05:00
David Sparer
29c422501a resolves #756 2017-10-29 12:17:18 -05:00
David Sparer
8efe74f614 bump assembly version v1.75.7009 2017-10-28 16:25:08 -05:00
David Sparer
4e0f12f4b9 Merge branch 'Patch9' 2017-10-28 15:55:09 -05:00
David Sparer
cbd3a61259 updated changelog and credits 2017-10-28 15:48:16 -05:00
David Sparer
2406a7be49 fixes #600 2017-10-28 15:12:30 -05:00
Bruce Peterson
87322a36ca Included Test Cases for RDCMan v2.7 2017-10-27 23:36:36 -04:00
Bruce Peterson
bbe4d28a40 Modified Conn Manager Deserializer to import from RDCMan v2.7 2017-10-27 23:35:30 -04:00
David Sparer
dd40b56047 Merge pull request #728 from dekelMP/Patch9
Fixed #529
2017-10-27 18:55:22 -05:00
Sean Kaim
f14a0d5ee3 Merge pull request #710 from pedro2555/issue#649-cannot-integrate-cli-apps
Fixed integrated cli apps?
2017-10-19 09:54:07 -04:00
David Sparer
2994419381 revert confcons version back to 2.6 when serializing 2017-10-17 13:55:03 -05:00
David Sparer
81f06026d0 no longer try to load credential repo list 2017-10-17 13:54:39 -05:00
David Sparer
2df9441c20 reverted credential manager functionality as best I could 2017-10-16 14:39:41 -05:00
Sean Kaim
47190d9c02 Update ISSUE_TEMPLATE.md 2017-09-27 13:58:05 -04:00
Dekel Asaf
e0383d6c59 Fixed #529 2017-09-22 20:57:46 +03:00
Pedro Rodrigues
eeabcd94ed re-removed WaitForInputIdle
later consideration
2017-09-19 23:07:55 +01:00
Sean Kaim
8a3e37041a remove unnecessary converts 2017-09-18 17:37:04 -04:00
Sean Kaim
a1e9aefeb2 Merge branch 'Patch9' of https://github.com/mRemoteNG/mRemoteNG into Patch9 2017-09-18 10:02:09 -04:00
Sean Kaim
670cb51352 unnecessary convert.tostring's 2017-09-18 10:02:07 -04:00
Sean Kaim
a43dff88c5 Merge pull request #715 from pedro2555/492
fallback to empty credentials settings in external apps
2017-09-18 09:58:24 -04:00
David Sparer
fb3c87359f Merge pull request #724 from mRemoteNG/482_proposed_fix
Default connection password must be decrypted before first use
2017-09-18 08:48:06 -05:00
kmscode
a49dec7e6d just claify a comment. 2017-09-17 14:57:56 -04:00
kmscode
a7156235c3 puttyng 0.70
fixes #635
2017-09-17 14:22:36 -04:00
David Sparer
3cb52ba3f1 rearranged program init to ensure ConDefaultPassword is decrypted before assignment to DefaultConnectionInfo object 2017-09-17 11:10:32 -05:00
Sean Kaim
024f1a7047 minor code clean up 2017-09-15 17:37:28 -04:00
Sean Kaim
b77c7e922f Merge pull request #720 from pedro2555/676
First startup ignores cons param
2017-09-15 17:33:22 -04:00
Sean Kaim
9335c4706b fix editbin post build on jenkins 2017-09-15 16:52:42 -04:00