diff --git a/SEOMacroscopeEngine/SEOMacroscopeEngine.csproj b/SEOMacroscopeEngine/SEOMacroscopeEngine.csproj index be8cd1a..597ecf5 100644 --- a/SEOMacroscopeEngine/SEOMacroscopeEngine.csproj +++ b/SEOMacroscopeEngine/SEOMacroscopeEngine.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/SEOMacroscopeSeriesOne/App.config b/SEOMacroscopeSeriesOne/App.config index 4adf4da..2182f9d 100644 --- a/SEOMacroscopeSeriesOne/App.config +++ b/SEOMacroscopeSeriesOne/App.config @@ -42,7 +42,7 @@ - + diff --git a/SEOMacroscopeSeriesOne/Properties/AssemblyInfo.cs b/SEOMacroscopeSeriesOne/Properties/AssemblyInfo.cs index 55c9a04..0e9198f 100644 --- a/SEOMacroscopeSeriesOne/Properties/AssemblyInfo.cs +++ b/SEOMacroscopeSeriesOne/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ [assembly: AssemblyConfiguration( "" )] [assembly: AssemblyCompany( "" )] [assembly: AssemblyProduct( "SEO Macroscope" )] -[assembly: AssemblyCopyright( "Copyright © 2018 Jason Holland" )] +[assembly: AssemblyCopyright( "Copyright © 2018 Jason Holland" )] [assembly: AssemblyTrademark( "" )] [assembly: AssemblyCulture( "" )] diff --git a/SEOMacroscopeSeriesOne/SEOMacroscopeSeriesOne.csproj b/SEOMacroscopeSeriesOne/SEOMacroscopeSeriesOne.csproj index bd3ca8d..c56d182 100644 --- a/SEOMacroscopeSeriesOne/SEOMacroscopeSeriesOne.csproj +++ b/SEOMacroscopeSeriesOne/SEOMacroscopeSeriesOne.csproj @@ -94,8 +94,8 @@ ..\packages\FastMember.Signed.1.3.0\lib\net45\FastMember.Signed.dll - - ..\packages\HtmlAgilityPack.1.7.4\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.8.0\lib\Net45\HtmlAgilityPack.dll ..\packages\HtmlAgilityPack.CssSelectors.1.0.2\lib\net45\HtmlAgilityPack.CssSelectors.dll @@ -177,11 +177,11 @@ ..\packages\ZKWeb.System.Drawing.4.0.1\lib\net45\ZKWeb.System.Drawing.dll - - ..\packages\ZXing.Net.0.16.2\lib\net47\zxing.dll + + ..\packages\ZXing.Net.0.16.4\lib\net47\zxing.dll - - ..\packages\ZXing.Net.0.16.2\lib\net47\zxing.presentation.dll + + ..\packages\ZXing.Net.0.16.4\lib\net47\zxing.presentation.dll diff --git a/SEOMacroscopeSeriesOne/packages.config b/SEOMacroscopeSeriesOne/packages.config index 60bafa8..eca1835 100644 --- a/SEOMacroscopeSeriesOne/packages.config +++ b/SEOMacroscopeSeriesOne/packages.config @@ -9,7 +9,7 @@ - + @@ -29,5 +29,5 @@ - + \ No newline at end of file diff --git a/SEOMacroscopeSeriesOne/src/MacroscopeEnvironment/MacroscopePreferencesManager.cs b/SEOMacroscopeSeriesOne/src/MacroscopeEnvironment/MacroscopePreferencesManager.cs index 20f7690..edc8bae 100644 --- a/SEOMacroscopeSeriesOne/src/MacroscopeEnvironment/MacroscopePreferencesManager.cs +++ b/SEOMacroscopeSeriesOne/src/MacroscopeEnvironment/MacroscopePreferencesManager.cs @@ -492,7 +492,7 @@ public static void SetDefaultValues () MaxHeadingDepth = 2; AnalyzeKeywordsInText = false; - AnalyzeTextReadability = true; + AnalyzeTextReadability = false; AnalyzeTextReadabilityEnglishAlgorithm = 0; /** Custom Filter Options -------------------------------------------- **/ diff --git a/SEOMacroscopeSeriesOne/src/MacroscopeUserControls/MacroscopePrefsControl/MacroscopePrefsControl.Designer.cs b/SEOMacroscopeSeriesOne/src/MacroscopeUserControls/MacroscopePrefsControl/MacroscopePrefsControl.Designer.cs index e51f6d7..f7f4f8e 100644 --- a/SEOMacroscopeSeriesOne/src/MacroscopeUserControls/MacroscopePrefsControl/MacroscopePrefsControl.Designer.cs +++ b/SEOMacroscopeSeriesOne/src/MacroscopeUserControls/MacroscopePrefsControl/MacroscopePrefsControl.Designer.cs @@ -362,6 +362,7 @@ private void InitializeComponent() this.tabPageNetworkSettings = new System.Windows.Forms.TabPage(); this.flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel(); this.groupBox33 = new System.Windows.Forms.GroupBox(); + this.label10 = new System.Windows.Forms.Label(); this.comboBoxProxyType = new System.Windows.Forms.ComboBox(); this.label9 = new System.Windows.Forms.Label(); this.groupBox28 = new System.Windows.Forms.GroupBox(); @@ -370,7 +371,6 @@ private void InitializeComponent() this.flowLayoutPanel7 = new System.Windows.Forms.FlowLayoutPanel(); this.groupBox19 = new System.Windows.Forms.GroupBox(); this.checkBoxEnableMemoryGuard = new System.Windows.Forms.CheckBox(); - this.label10 = new System.Windows.Forms.Label(); this.tabControlPreferences.SuspendLayout(); this.tabPageSpideringControl.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); @@ -2397,6 +2397,15 @@ private void InitializeComponent() this.groupBox33.TabStop = false; this.groupBox33.Text = "HTTP Proxy"; // + // label10 + // + this.label10.Location = new System.Drawing.Point(20, 60); + this.label10.Margin = new System.Windows.Forms.Padding(0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(460, 20); + this.label10.TabIndex = 14; + this.label10.Text = "Proxy setting changes take effect the next time that SEO Macroscope is run."; + // // comboBoxProxyType // this.comboBoxProxyType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -2481,15 +2490,6 @@ private void InitializeComponent() this.checkBoxEnableMemoryGuard.Text = "Enable memory guard"; this.checkBoxEnableMemoryGuard.UseVisualStyleBackColor = true; // - // label10 - // - this.label10.Location = new System.Drawing.Point(20, 60); - this.label10.Name = "label10"; - this.label10.Padding = new System.Windows.Forms.Padding(4, 2, 0, 0); - this.label10.Size = new System.Drawing.Size(460, 20); - this.label10.TabIndex = 14; - this.label10.Text = "Proxy setting changes take effect the next time that SEO Macroscope is run."; - // // MacroscopePrefsControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/SEOMacroscopeSeriesTwo/SEOMacroscopeSeriesTwo.csproj b/SEOMacroscopeSeriesTwo/SEOMacroscopeSeriesTwo.csproj index b647a65..b739f9f 100644 --- a/SEOMacroscopeSeriesTwo/SEOMacroscopeSeriesTwo.csproj +++ b/SEOMacroscopeSeriesTwo/SEOMacroscopeSeriesTwo.csproj @@ -55,8 +55,8 @@ ..\packages\FastMember.Signed.1.3.0\lib\net45\FastMember.Signed.dll - - ..\packages\HtmlAgilityPack.1.7.4\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.8.0\lib\Net45\HtmlAgilityPack.dll @@ -99,11 +99,11 @@ - - ..\packages\ZXing.Net.0.16.2\lib\net47\zxing.dll + + ..\packages\ZXing.Net.0.16.4\lib\net47\zxing.dll - - ..\packages\ZXing.Net.0.16.2\lib\net47\zxing.presentation.dll + + ..\packages\ZXing.Net.0.16.4\lib\net47\zxing.presentation.dll diff --git a/SEOMacroscopeSeriesTwo/packages.config b/SEOMacroscopeSeriesTwo/packages.config index 3128511..80a7202 100644 --- a/SEOMacroscopeSeriesTwo/packages.config +++ b/SEOMacroscopeSeriesTwo/packages.config @@ -5,7 +5,7 @@ - + @@ -15,5 +15,5 @@ - + \ No newline at end of file diff --git a/docs/_collection_releases/v1.7.1.0.md b/docs/_collection_releases/v1.7.1.0.md index 4e2050c..a0f8e8f 100644 --- a/docs/_collection_releases/v1.7.1.0.md +++ b/docs/_collection_releases/v1.7.1.0.md @@ -3,5 +3,5 @@ name: SEO Macrocope v1.7.1.0 tag: v1.7.1.0 arch: 64 installer: SEO-Macroscope-Installer-1.7.1.0.msi -published: false +published: true --- diff --git a/docs/_drafts/2018-04-13-seo-macroscope-release-v1.7.1.0.md b/docs/_posts/2018-04-15-seo-macroscope-release-v1.7.1.0.md similarity index 77% rename from docs/_drafts/2018-04-13-seo-macroscope-release-v1.7.1.0.md rename to docs/_posts/2018-04-15-seo-macroscope-release-v1.7.1.0.md index 35d3792..213dd12 100644 --- a/docs/_drafts/2018-04-13-seo-macroscope-release-v1.7.1.0.md +++ b/docs/_posts/2018-04-15-seo-macroscope-release-v1.7.1.0.md @@ -1,13 +1,13 @@ --- layout: post -title: "New v1.7.1 release of SEO Macroscope: HTTP Too" -date: "2018-04-13 18:00:00 -09:00" -published: false -description: "This release of SEO Macroscope primarily fixes bugs." -excerpt: "This release of SEO Macroscope primarily fixes bugs." +title: "New v1.7.1 release of SEO Macroscope: HTTP Too and a half" +date: "2018-04-15 18:00:00 -09:00" +published: true +description: "This release of SEO Macroscope primarily fixes bugs from v1.7." +excerpt: "This release of SEO Macroscope primarily fixes bugs from v1.7." --- -This release of SEO Macroscope primarily fixes bugs in v1.7. +This release of SEO Macroscope primarily fixes bugs from v1.7. {: .lead } Source code and an installer can be found on GitHub at: @@ -19,6 +19,7 @@ Please check the [downloads page]({{ "/downloads/" | relative_url }}) for more r ## New features in this release include: * There is a new hyperlink ratio feature found in the document details panel, and in the overview Excel and CSV reports. This calculates the percentage value for the number of hyperlinks in and out of a particular document, within the crawled collection. It does not include links from third-party sites not in the crawled collection. +* The web proxy settings may now now the systems configured proxies. ## Bug fixes diff --git a/docs/manual/images/preferences-network-settings.png b/docs/manual/images/preferences-network-settings.png index 71120c1..912544d 100644 Binary files a/docs/manual/images/preferences-network-settings.png and b/docs/manual/images/preferences-network-settings.png differ diff --git a/docs/manual/index.md b/docs/manual/index.md index bf53754..7aadfde 100644 --- a/docs/manual/index.md +++ b/docs/manual/index.md @@ -2,7 +2,7 @@ layout: page title: SEO Macroscope User Manual description: "The SEO Macroscope user manual." -date: "2018-04-01 21:00:00 -09:00" +date: "2018-04-15 21:00:00 -09:00" redirect_from: - /manual/preferences/spidering-control/ --- @@ -593,17 +593,11 @@ Configure your network settings here. Configure your web proxy settings here. Please consult your network administrator, if necessary. -##### HTTP Proxy Hostname +##### Select configured system proxy -Enter the IP address or hostname of your network's web proxy. - -Leave this blank if no web proxy is required. - -##### HTTP Proxy Port - -Enter the port that your web proxy requires. - -Set this to 0 if no web proxy is required. +* Select **No proxy** to disable the use of a web proxy. +* Select **WinInetProxy** to use the web proxy configured in your Internet Explorer or Edge preferences. In many cases, this is the most commonly required option. +* Select **WinHttpProxy** to use the system-wide web proxy configured for your system. #### Server Certificates