From deaf26109b970da33a034d24e0603a273cf8518f Mon Sep 17 00:00:00 2001 From: Poornima Nayar Date: Tue, 15 May 2018 19:33:36 +0100 Subject: [PATCH 01/19] check for recursive value --- src/Umbraco.Web/umbraco.presentation/item.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/item.cs b/src/Umbraco.Web/umbraco.presentation/item.cs index 1edc6cca17..33150d6187 100644 --- a/src/Umbraco.Web/umbraco.presentation/item.cs +++ b/src/Umbraco.Web/umbraco.presentation/item.cs @@ -66,8 +66,12 @@ namespace umbraco if (publishedContent == null) { - var recursiveVal = GetRecursiveValueLegacy(elements); - _fieldContent = recursiveVal.IsNullOrWhiteSpace() ? _fieldContent : recursiveVal; + if (recursive) + { + var recursiveVal = GetRecursiveValueLegacy(elements); + _fieldContent = recursiveVal.IsNullOrWhiteSpace() ? _fieldContent : recursiveVal; + } + } //check for published content and get its value using that @@ -222,4 +226,4 @@ namespace umbraco } } } -} \ No newline at end of file +} From 7baca85f6a12e2ade4608dd8aa5738b7ffc39d42 Mon Sep 17 00:00:00 2001 From: Imran Haider Date: Fri, 27 Jul 2018 16:08:38 +0100 Subject: [PATCH 02/19] Update ourumbraco references to https --- .../UmbracoSettings/HelpElement.cs | 2 +- .../Packaging/Models/PackageAction.cs | 2 +- src/Umbraco.Core/Sync/ApplicationUrlHelper.cs | 2 +- .../umbracoSettings.minimal.config | 36 +++++++++--------- .../SqlScripts/SqlCe-SchemaAndData-4110.sql | Bin 422840 -> 422888 bytes .../Importing/ImportResources.Designer.cs | 4 +- .../Importing/StandardMvc-Package.xml | 4 +- .../Importing/TemplateOnly-Package.xml | 2 +- .../TemplateOnly-Updated-Package.xml | 2 +- .../Services/Importing/uBlogsy-Package.xml | 2 +- .../Services/PerformanceTests.cs | 2 +- .../src/common/services/help.service.js | 2 +- .../installer/steps/permissionsreport.html | 2 +- .../src/installer/steps/starterkit.html | 2 +- .../src/views/common/dialogs/help.html | 2 +- .../src/views/common/drawers/help/help.html | 2 +- .../src/views/common/overlays/help/help.html | 2 +- .../developer/developerdashboardintro.html | 6 +-- .../members/membersdashboardintro.html | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../Properties/Settings.settings | 2 +- src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml | 4 +- .../Umbraco/config/lang/zh_tw.xml | 4 +- .../config/umbracoSettings.Release.config | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 4 +- .../umbraco/config/lang/en_us.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/tr.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 4 +- .../Tree/jquery.tree.contextmenu.js | 2 +- src/Umbraco.Web.UI/web.Template.config | 2 +- src/Umbraco.Web/Install/InstallHelper.cs | 2 +- .../EnsurePublishedContentRequestAttribute.cs | 2 +- src/Umbraco.Web/Properties/Settings.settings | 2 +- .../Properties/Settings1.Designer.cs | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 4 +- .../org.umbraco.our/Reference.map | 4 +- .../org.umbraco.our/repository.disco | 6 +-- .../org.umbraco.our/repository.wsdl | 8 ++-- src/Umbraco.Web/app.config | 2 +- .../developer/Packages/editPackage.aspx | 2 +- .../umbraco/uQuery/DocumentExtensions.cs | 4 +- .../umbraco/uQuery/NodeExtensions.cs | 8 ++-- .../umbraco/uQuery/uQuery-Nodes.cs | 2 +- .../IntegerDataTypeModel.cs | 2 +- 57 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs index eb1e452100..6224150c51 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs @@ -9,7 +9,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings [Obsolete("This is no longer used and will be removed in future versions")] internal class HelpElement : ConfigurationElement, IHelpSection { - [ConfigurationProperty("defaultUrl", DefaultValue = "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}")] + [ConfigurationProperty("defaultUrl", DefaultValue = "https://our.umbraco.org/wiki/umbraco-help/{0}/{1}")] public string DefaultUrl { get { return (string) base["defaultUrl"]; } diff --git a/src/Umbraco.Core/Packaging/Models/PackageAction.cs b/src/Umbraco.Core/Packaging/Models/PackageAction.cs index 58f7de8078..a5fcc75220 100644 --- a/src/Umbraco.Core/Packaging/Models/PackageAction.cs +++ b/src/Umbraco.Core/Packaging/Models/PackageAction.cs @@ -27,7 +27,7 @@ namespace Umbraco.Core.Packaging.Models set { _runAt = value; } } - public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (http://our.umbraco.org/wiki/reference/packaging/package-actions) + public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (https://our.umbraco.org/wiki/reference/packaging/package-actions) { get { return _undo ?? true; } set { _undo = value; } diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs index 57520a3754..bee4351577 100644 --- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs +++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs @@ -156,7 +156,7 @@ namespace Umbraco.Core.Sync // otherwise, // if non-standard ports used, // user may need to set umbracoApplicationUrl manually per - // http://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks + // https://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks var port = (request.IsSecureConnection == false && GlobalSettings.UseSSL == false) || (request.IsSecureConnection && GlobalSettings.UseSSL) ? ":" + request.ServerVariables["SERVER_PORT"] diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config index b6ea54d75e..f105e17463 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config @@ -3,27 +3,27 @@ - + - + - + - + 1 - + robot@umbraco.dk @@ -31,42 +31,42 @@ - - - + Mvc - + - + - + - + - + - + - + - + - + diff --git a/src/Umbraco.Tests/Migrations/SqlScripts/SqlCe-SchemaAndData-4110.sql b/src/Umbraco.Tests/Migrations/SqlScripts/SqlCe-SchemaAndData-4110.sql index ee157be2a7727816291ced4cab1a95fadc67e061..23a8acfd31d0ce6c35c48652dc43e4116f7bf9ed 100644 GIT binary patch delta 345 zcmdn-T=KlQW>|oB^zGfB^4-;eY_K!j=$;>dpJz^|dfPx?us?+CX zvgmE^Sj^-x1Ej2jITb7;#8SL{!x7edP-WTM1^Ss6AnR$^E^?Dejd6Q~8}lqD5_N`5 zV%DmIIfghFP6xU$V!M|&f=z{$opEr-=<`>`{u HpOygt5gLcD delta 402 zcmaFyTyn>A$%YojEle)6rYB@DvrVrMV@cc2BFMtQ1mVwcWLB6yp_|!fdxJ2`2Z-Qy zpdvA5i2RC77N6}C7BhLwfU8g0p4Z9zixJLO*bdaM1yR2pXdVkf>%8qblbF>Qw`aI9 z&vJrmAk_e^I*3+s+&&%X_K59PQY?$yNVUHm==bd_GFhV{NYx3{#d3pj`T|ZizUcy` RtWMJ;SXs9JI>Y*I835nFhB5#E diff --git a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs index c640d21aa7..46dada5a9b 100644 --- a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs +++ b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs @@ -313,7 +313,7 @@ namespace Umbraco.Tests.Services.Importing { /// <name>Template-Update</name> /// <version>0.1</version> /// <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license> - /// <url>http://our.umbraco.org/projects</url> + /// <url>https://our.umbraco.org/projects</url> /// <requirements> /// <major>3</major> /// <minor>0</minor> @@ -339,7 +339,7 @@ namespace Umbraco.Tests.Services.Importing { /// <name>Template-Update</name> /// <version>0.1</version> /// <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license> - /// <url>http://our.umbraco.org/projects</url> + /// <url>https://our.umbraco.org/projects</url> /// <requirements> /// <major>3</major> /// <minor>0</minor> diff --git a/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml index 82cbcc5d84..e6e4708a2e 100644 --- a/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml @@ -177,7 +177,7 @@ StandardWebsiteMVC 2.0 MIT license - http://our.umbraco.org/projects/starter-kits/standard-website-mvc + https://our.umbraco.org/projects/starter-kits/standard-website-mvc 3 0 @@ -218,7 +218,7 @@ Google Maps - A map macro that you can use within Rich Text Areas Contact Us -

Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

]]> +

Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

]]>
Standard Website MVC, Company Address, Glasgow, Postcode
diff --git a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml index 1f29ffb806..675a5f8483 100644 --- a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml @@ -6,7 +6,7 @@ Template-Update 0.1 MIT license - http://our.umbraco.org/projects + https://our.umbraco.org/projects 3 0 diff --git a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml index 1225b36fa2..1cbd9bb3f3 100644 --- a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml @@ -6,7 +6,7 @@ Template-Update 0.1 MIT license - http://our.umbraco.org/projects + https://our.umbraco.org/projects 3 0 diff --git a/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml b/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml index 98e12465f5..86addb351f 100644 --- a/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml @@ -332,7 +332,7 @@ uBlogsy 3.0 MIT license - http://our.umbraco.org/projects/starter-kits/ublogsy + https://our.umbraco.org/projects/starter-kits/ublogsy 3 0 diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs index 69f39392d6..39a3f00bed 100644 --- a/src/Umbraco.Tests/Services/PerformanceTests.cs +++ b/src/Umbraco.Tests/Services/PerformanceTests.cs @@ -314,7 +314,7 @@ namespace Umbraco.Tests.Services Umbraco Development

UmbracoUmbraco the the leading ASP.NET open source CMS, under pinning over 150,000 websites. Our Certified Developers are experts in developing high performance and feature rich websites.

]]> Contact Us -

Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

]]> +

Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

]]>
Standard Website MVC, Company Address, Glasgow, Postcode
Copyright &copy; 2012 Your Company diff --git a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js index 77621eee9c..bad1fa4e49 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js @@ -2,7 +2,7 @@ angular.module('umbraco.services') .factory('helpService', function ($http, $q, umbRequestHelper) { var helpTopics = {}; - var defaultUrl = "http://our.umbraco.org/rss/help"; + var defaultUrl = "https://our.umbraco.org/rss/help"; var tvUrl = "http://umbraco.tv/feeds/help"; function getCachedHelp(url){ diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html index 3ced6ed678..266f360394 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html @@ -3,7 +3,7 @@

In order to run umbraco, you'll need to update your permission settings. Detailed information about the correct file & folder permissions for Umbraco can be found - here. + here.

The following report list the permissions that are currently failing. Once the permissions are fixed press the 'Go back' button to restart the installation. diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html index 0b9e22a0f3..2f76de5525 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html @@ -12,7 +12,7 @@

  • Loading... - {{pck.name}} + {{pck.name}}
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html index b9428fb242..a6d3827343 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html @@ -22,7 +22,7 @@