swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with 4.10.0

Browse Source
This commit is contained in:
Morten Christensen
2012-11-08 18:29:07 -01:00
parent 54df4855bc 885b421201
commit c5d86e9525
28 changed files with 142 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hgtags
+1
View File
@@ -14,3 +14,4 @@ de73e687ddf6086ed52b6554676c1632865d07f2 Release-4.9.0
0000000000000000000000000000000000000000 Release-4.9.0
0000000000000000000000000000000000000000 Release-4.9.0
09f5a69cf19ebf7ddd9501e5258bee1e6a125391 Release-4.9.0
f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0
src/Umbraco.Core/PublishedContentExtensions.cs
+3 -3
View File
@@ -32,9 +32,9 @@ namespace Umbraco.Core
var prop = content.GetPropertyRecursive(alias);
while (prop == null || prop.Value == null || prop.Value.ToString().IsNullOrWhiteSpace())
{
var parent = context.Parent;
if (parent == null) break;
prop = context.GetPropertyRecursive(alias);
if (context.Parent == null) break;
context = context.Parent;
prop = context.GetPropertyRecursive(alias);
}
return prop;
}
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+15 -13
View File
@@ -126,8 +126,8 @@
<HintPath>..\..\lib\WebPages\Microsoft.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\WebPages\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Our.Umbraco.uGoLive">
<HintPath>..\..\lib\Our.Umbraco.uGoLive.dll</HintPath>
@@ -171,28 +171,30 @@
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Extensions.Design" />
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\WebPages\System.Web.Helpers.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\WebPages\System.Web.Razor.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.Services">
<Name>System.Web.Services</Name>
</Reference>
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\WebPages\System.Web.WebPages.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\WebPages\System.Web.WebPages.Deployment.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\WebPages\System.Web.WebPages.Razor.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml">
<Name>System.XML</Name>
src/Umbraco.Web.UI/packages.config
+4
View File
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
</packages>
src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+4
View File
@@ -420,6 +420,7 @@
<key alias="notAllowedByContentType">Den aktuella sidan får inte vara undersida till den valda sidan eftersom den har fel dokumenttyp.</key>
<key alias="notAllowedByPath">Den aktuella sidan kan inte flyttas till en av sina egna undersidor.</key>
<key alias="notValid">Händelsen är inte tillåten på grund av att du inte har tillräckliga rättigheter till 1 eller flera underliggande sidor</key>
<key alias="relateToOriginal">Relatera kopierat objekt till orginalet</key>
</area>
<area alias="notifications">
<key alias="editNotifications">Inställningar för notifieringar gällande %0%</key>
@@ -571,6 +572,7 @@
<key alias="editTemplateSaved">Sidmallen har sparats</key>
<key alias="editUserError">Ett fel inträffade när användaren sparades (läs logg-filen)</key>
<key alias="editUserSaved">Användaren har sparats</key>
<key alias="editUserTypeSaved">Användartypen har sparats</key>
<key alias="fileErrorHeader">Filen sparades inte</key>
<key alias="fileErrorText">filen kunde inte sparas. Kontrollera filrättigheterna</key>
<key alias="fileSavedHeader">Filen har sparats</key>
@@ -724,6 +726,8 @@
<key alias="passwordConfirm">Vänligen bekräfta ditt nya lösenord</key>
<key alias="passwordEnterNew">Vänligen fyll i ditt nya lösenord</key>
<key alias="passwordIsBlank">Ditt nya lösenord kan inte vara tomt!</key>
<key alias="passwordCurrent">Nuvarande lösenord</key>
<key alias="passwordInvalid">Nuvarande lösenord är ogiltigt</key>
<key alias="passwordIsDifferent">Lösenorden matchar inte. Vänligen försök igen!</key>
<key alias="passwordMismatch">Det bekräftade lösenordet matchar inte det nya lösenordet!</key>
<key alias="permissionReplaceChildren">Ersätt rättigheterna på underliggande noder</key>
src/Umbraco.Web.UI/web.Template.Debug.config
+2
View File
@@ -16,6 +16,8 @@
-->
<system.web>
<compilation debug="true" xdt:Transform="SetAttributes(debug)" />
<trust level="Medium" xdt:Transform="Remove" />
<trust level="Medium" originUrl=".*" xdt:Transform="Insert" />
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
src/Umbraco.Web.UI/web.Template.Release.config
+1
View File
@@ -15,6 +15,7 @@
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<trust xdt:Transform="Remove"/>
<trace enabled="false" xdt:Transform="SetAttributes(enabled)" />
<customErrors mode="RemoteOnly" xdt:Transform="SetAttributes(mode)">
</customErrors>
src/Umbraco.Web.UI/web.Template.config
+1
View File
@@ -109,6 +109,7 @@
<system.web>
<customErrors mode="RemoteOnly" />
<trust level="Medium" originUrl=".*"/>
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;Trusted_Connection=yes" cookieless="false" timeout="20" />
<globalization requestEncoding="UTF-8" responseEncoding="UTF-8" />
src/Umbraco.Web/UmbracoHelper.cs
+7
View File
@@ -249,6 +249,8 @@ namespace Umbraco.Web
attributesForItem.Add(i.Key, i.Value);
}
var item = new Item()
{
//NodeId = currentPage.Id.ToString();
@@ -256,6 +258,11 @@ namespace Umbraco.Web
TextIfEmpty = altText,
LegacyAttributes = attributesForItem
};
//this is here to figure out if this request is in the context of a partial
if (_umbracoContext.PublishedContentRequest.PublishedContent.Id != _currentPage.Id)
item.NodeId = _currentPage.Id.ToString();
var containerPage = new FormlessPage();
containerPage.Controls.Add(item);
src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
+29 -20
View File
@@ -96,27 +96,36 @@ namespace umbraco.presentation.templateControls
int? tempNodeId = item.GetParsedNodeId();
if (tempNodeId != null && tempNodeId.Value != 0)
{
string currentField = helper.FindAttribute(item.LegacyAttributes, "field");
//moved the following from the catch block up as this will allow fallback options alt text etc to work
page itemPage = new page(content.Instance.XmlContent.GetElementById(tempNodeId.ToString()));
tempElementContent = new item(itemPage.Elements, item.LegacyAttributes).FieldContent;
/*removed as would fail as there is a incorrect cast in the method called.
Also the following code does not respect any of Umbraco Items fallback and formatting options */
//string currentField = helper.FindAttribute(item.LegacyAttributes, "field");
// check for a cached instance of the content
object contents = GetContentFromCache(tempNodeId.Value, currentField);
if (contents != null)
tempElementContent = (string)contents;
else
{
// as the field can be used for both documents, media and even members we'll use the
// content class to lookup field items
try
{
tempElementContent = GetContentFromDatabase(item.LegacyAttributes, tempNodeId.Value, currentField);
}
catch
{
// content was not found in property fields,
// so the last place to look for is page fields
page itemPage = new page(content.Instance.XmlContent.GetElementById(tempNodeId.ToString()));
tempElementContent = new item(itemPage.Elements, item.LegacyAttributes).FieldContent;
}
}
//object contents = GetContentFromCache(tempNodeId.Value, currentField);
//if (contents != null)
// tempElementContent = (string)contents;
//else
//{
// // as the field can be used for both documents, media and even members we'll use the
// // content class to lookup field items
// try
// {
// tempElementContent = GetContentFromDatabase(item.LegacyAttributes, tempNodeId.Value, currentField);
// }
// catch
// {
// // content was not found in property fields,
// // so the last place to look for is page fields
// page itemPage = new page(content.Instance.XmlContent.GetElementById(tempNodeId.ToString()));
// tempElementContent = new item(itemPage.Elements, item.LegacyAttributes).FieldContent;
// }
//}
}
}
src/packages/Microsoft.AspNet.Mvc.3.0.20105.1/Microsoft.AspNet.Mvc.3.0.20105.1.nupkg
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.AspNet.Mvc.3.0.20105.1/Microsoft.AspNet.Mvc.3.0.20105.1.nuspec
Vendored
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Microsoft.AspNet.Mvc</id>
<version>3.0.20105.1</version>
<title>ASP.NET MVC 3</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/aspnetmvc3update-eula.htm</licenseUrl>
<projectUrl>http://www.asp.net/mvc</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>This package contains the runtime assemblies for ASP.NET MVC. ASP.NET MVC gives you a powerful, patterns-based way to build dynamic websites that enables a clean separation of concerns and that gives you full control over markup.</description>
<dependencies>
<dependency id="Microsoft.AspNet.WebPages" version="1.0.20105.408" />
<dependency id="Microsoft.AspNet.Razor" version="1.0.20105.408" />
</dependencies>
</metadata>
</package>
src/packages/Microsoft.AspNet.Mvc.3.0.20105.1/lib/net40/System.Web.Mvc.dll
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.AspNet.Razor.1.0.20105.408/Microsoft.AspNet.Razor.1.0.20105.408.nupkg
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.AspNet.Razor.1.0.20105.408/Microsoft.AspNet.Razor.1.0.20105.408.nuspec
Vendored
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Microsoft.AspNet.Razor</id>
<version>1.0.20105.408</version>
<title>Microsoft ASP.NET Razor</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/aspnetwebpages_eula.rtf</licenseUrl>
<projectUrl>http://www.asp.net/web-pages</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>This package contains the runtime assemblies for ASP.NET Web Pages. ASP.NET Web Pages and the new Razor syntax provide a fast, terse, clean and lightweight way to combine server code with HTML to create dynamic web content.</description>
</metadata>
</package>
src/packages/Microsoft.AspNet.Razor.1.0.20105.408/lib/net40/System.Web.Razor.dll
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.AspNet.WebPages.1.0.20105.408/Microsoft.AspNet.WebPages.1.0.20105.408.nupkg
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.AspNet.WebPages.1.0.20105.408/Microsoft.AspNet.WebPages.1.0.20105.408.nuspec
Vendored
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Microsoft.AspNet.WebPages</id>
<version>1.0.20105.408</version>
<title>Microsoft ASP.NET Web Pages</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>http://www.microsoft.com/web/webpi/eula/aspnetwebpages_eula.rtf</licenseUrl>
<projectUrl>http://www.asp.net/web-pages</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>This package contains core runtime assemblies shared between ASP.NET MVC and ASP.NET Web Pages.</description>
<dependencies>
<dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<dependency id="Microsoft.AspNet.Razor" version="1.0.20105.408" />
</dependencies>
</metadata>
</package>
src/packages/Microsoft.AspNet.WebPages.1.0.20105.408/lib/net40/System.Web.Helpers.dll
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.AspNet.WebPages.1.0.20105.408/lib/net40/System.Web.WebPages.Deployment.dll
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.AspNet.WebPages.1.0.20105.408/lib/net40/System.Web.WebPages.Razor.dll
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.AspNet.WebPages.1.0.20105.408/lib/net40/System.Web.WebPages.dll
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.Web.Infrastructure.1.0.0.0/Microsoft.Web.Infrastructure.1.0.0.0.nupkg
Vendored
BIN
View File
Binary file not shown.
src/packages/Microsoft.Web.Infrastructure.1.0.0.0/Microsoft.Web.Infrastructure.1.0.0.0.nuspec
Vendored
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Microsoft.Web.Infrastructure</id>
<version>1.0.0.0</version>
<title>Microsoft.Web.Infrastructure</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>http://go.microsoft.com/fwlink/?LinkID=214339</licenseUrl>
<projectUrl>http://www.asp.net/</projectUrl>
<iconUrl>https://download-codeplex.sec.s-msft.com/Download?ProjectName=aspnetwebstack&amp;DownloadId=360555</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package contains the Microsoft.Web.Infrastructure assembly that lets you dynamically register HTTP modules at run time.</description>
<summary>This package contains the Microsoft.Web.Infrastructure assembly that lets you dynamically register HTTP modules at run time.</summary>
<tags>ASPNETWEBPAGES</tags>
</metadata>
</package>
src/packages/Microsoft.Web.Infrastructure.1.0.0.0/lib/net40/Microsoft.Web.Infrastructure.dll
Vendored
BIN
View File
Binary file not shown.
src/umbraco.editorControls/numberfield/numberField.cs
+2 -1
View File
@@ -1,6 +1,7 @@
using System;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Globalization;
namespace umbraco.editorControls
{
@@ -75,7 +76,7 @@ namespace umbraco.editorControls
{
int integer;
if (int.TryParse(value, out integer))
if (int.TryParse(value, NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out integer))
{
base.Text = integer.ToString();
}
src/umbraco.presentation.targets
+4 -3
View File
@@ -71,7 +71,7 @@
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false"
Condition="!Exists('$(OutputFileName)')"
/>
/>
</Target>
<Target Name="CustomTarget" AfterTargets="CopyWebConfig">
@@ -86,7 +86,8 @@
<Message Text="$(OriginalFileName)" Importance="high" />
<Message Text="$(OutputFileName)" Importance="high" />
<TransformXml Source="$(OriginalFileName)" Transform="$(WebConfigSource)" Destination="$(OutputFileName)" />
<TransformXml Condition="$(BuildingInsideVisualStudio) == ''" Source="$(OriginalFileName)" Transform="$(WebConfigSource)" Destination="$(OutputFileName)" />
<TransformXml Condition="$(BuildingInsideVisualStudio) == 'true'" Source="$(OutputFileName)" Transform="$(WebConfigSource)" Destination="$(OutputFileName)" />
</Target>
<Target Name="ResetConfigFiles" Condition="$(ProjDir) != $(ProjOutputDir)" BeforeTargets="Build;Rebuild" Inputs="@(ConfigFiles)" Outputs="%(Identity).Dummy">
@@ -105,7 +106,7 @@
OverwriteReadOnlyFiles="true"
SkipUnchangedFiles="false"
Condition="Exists('$(ModifiedFileName)')"/>
</Target>
</Project>
src/umbraco.sln
+2 -2
View File
@@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-1
..\docs\ReleaseNotes.txt = ..\docs\ReleaseNotes.txt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web", "Umbraco.Web\Umbraco.Web.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.businesslogic", "umbraco.businesslogic\umbraco.businesslogic.csproj", "{E469A9CE-1BEC-423F-AC44-713CD72457EA}"
@@ -58,8 +60,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Core", "Umbraco.Cor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests", "Umbraco.Tests\Umbraco.Tests.csproj", "{5D3B8245-ADA6-453F-A008-50ED04BFE770}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{66AB0414-D4F2-435C-9868-E25B6865D9A9}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config