yv01p/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

28
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
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>

4
src/Umbraco.Web.UI/packages.config
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>

4
src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
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>

2
src/Umbraco.Web.UI/web.Template.Debug.config
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.

1
src/Umbraco.Web.UI/web.Template.Release.config
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>

1
src/Umbraco.Web.UI/web.Template.config
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" />