瀏覽代碼

Merge branch 'master' into dev

# Conflicts:
#	source/forms/Copy.cpp
#	source/forms/CustomScpExplorer.cpp
#	source/forms/CustomScpExplorer.h
#	source/forms/NonVisual.cpp
#	source/forms/NonVisual.dfm
#	source/forms/NonVisual.h
#	source/forms/ScpCommander.cpp
#	source/forms/ScpCommander.h
#	source/forms/ScpExplorer.h
#	source/forms/SiteAdvanced.dfm
#	source/packages/filemng/DirView.pas
#	source/packages/filemng/DriveView.pas
#	source/packages/filemng/FileOperator.pas
#	source/windows/TerminalManager.cpp
#	source/windows/TerminalManager.h
#	source/windows/WinMain.cpp

Source commit: 566b9f35363c1e72e4cdfea5c6802a3f4cf33f21
Martin Prikryl 4 年之前
父節點
當前提交
dcbed8c3a4
共有 3 個文件被更改,包括 3 次插入2 次删除
  1. 1 1
      dotnet/properties/AssemblyInfo.cs
  2. 0 1
      source/forms/CustomScpExplorer.cpp
  3. 2 0
      source/forms/SiteAdvanced.dfm

+ 1 - 1
dotnet/properties/AssemblyInfo.cs

@@ -35,7 +35,7 @@ namespace WinSCP
     {
         public const string UndefinedProductVersion = "9.9.9.9";
 
-        public const string Version = "1.7.2.0";
+        public const string Version = "1.8.0.0";
         public const string ProductVersion = "5.18.0.0";
     }
 }

+ 0 - 1
source/forms/CustomScpExplorer.cpp

@@ -4849,7 +4849,6 @@ void __fastcall TCustomScpExplorerForm::NewSession(const UnicodeString & Session
 {
   if (OpenInNewWindow())
   {
-    // todo: Pass FromSite
     ExecuteNewInstance(SessionUrl);
   }
   else

+ 2 - 0
source/forms/SiteAdvanced.dfm

@@ -1100,6 +1100,8 @@ object SiteAdvancedDialog: TSiteAdvancedDialog
       end
       object WebDavSheet: TTabSheet
         Tag = 2
+        HelpType = htKeyword
+        HelpKeyword = 'ui_login_webdav'
         Caption = 'WebDAV'
         ImageIndex = 17
         TabVisible = False