Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7

# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
#	src/Umbraco.Web/Trees/PartialViewsTree.cs

src/Umbraco.Web.UI/Properties/Settings.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace Umbraco.Web.UI.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
@@ -124,9 +124,8 @@
       <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="dotless.Core, Version=1.4.1.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\dotless.1.4.1.0\lib\dotless.Core.dll</HintPath>
+    <Reference Include="dotless.Core, Version=1.5.2.0, Culture=neutral, PublicKeyToken=96b446c9e63eae34, processorArchitecture=MSIL">
+      <HintPath>..\packages\dotless.1.5.2\lib\dotless.Core.dll</HintPath>
     </Reference>
     <Reference Include="Examine, Version=0.1.82.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Examine.0.1.82\lib\net45\Examine.dll</HintPath>
@@ -135,17 +134,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.2\lib\net45\ImageProcessor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ImageProcessor, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll</HintPath>
     </Reference>
-    <Reference Include="ImageProcessor.Web, Version=4.8.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.Web.4.8.2\lib\net45\ImageProcessor.Web.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="ImageProcessor.Web, Version=4.8.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.Web.4.8.3\lib\net45\ImageProcessor.Web.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\log4net-mediumtrust.2.0.0\lib\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Lucene.Net, Version=2.9.4.1, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -161,11 +157,9 @@
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -200,13 +194,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
+    <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
+      <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -217,7 +209,6 @@
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
@@ -251,7 +242,6 @@
     </Reference>
     <Reference Include="System.Reflection.Metadata, Version=1.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -354,22 +344,11 @@
     <Reference Include="Umbraco.ModelsBuilder, Version=3.0.7.99, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.7\lib\Umbraco.ModelsBuilder.dll</HintPath>
     </Reference>
-    <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UrlRewritingNet.UrlRewriter.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
-    <Compile Include="Umbraco\Install\Legacy\LoadStarterKits.ascx.cs">
-      <DependentUpon>loadStarterKits.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Install\Legacy\LoadStarterKits.ascx.designer.cs">
-      <DependentUpon>loadStarterKits.ascx</DependentUpon>
-    </Compile>
     <Compile Include="Config\splashes\NoNodes.aspx.cs">
       <DependentUpon>noNodes.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -468,13 +447,6 @@
     <Compile Include="Umbraco\Developer\Packages\DirectoryBrowser.aspx.designer.cs">
       <DependentUpon>directoryBrowser.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Umbraco\Developer\Packages\StarterKits.aspx.cs">
-      <DependentUpon>StarterKits.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Developer\Packages\StarterKits.aspx.designer.cs">
-      <DependentUpon>StarterKits.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Umbraco\Developer\Python\EditPython.aspx.cs">
       <DependentUpon>editPython.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -564,13 +536,6 @@
     <Compile Include="Umbraco\Settings\Stylesheet\Property\EditStyleSheetProperty.aspx.designer.cs">
       <DependentUpon>EditStyleSheetProperty.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Umbraco\Settings\Views\EditView.aspx.cs">
-      <DependentUpon>EditView.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Umbraco\Settings\Views\EditView.aspx.designer.cs">
-      <DependentUpon>EditView.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Umbraco\TreeInit.aspx.cs">
       <DependentUpon>treeInit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -601,9 +566,9 @@
     <Content Include="Config\Lang\sv-SE.user.xml" />
     <Content Include="Config\Lang\zh-CN.user.xml" />
     <Content Include="Umbraco\Config\Lang\cs.xml" />
-    <Content Include="Umbraco\Install\Legacy\loadStarterKits.ascx" />
     <Content Include="Umbraco\ClientRedirect.aspx" />
     <Content Include="Umbraco\create.aspx" />
+    <Content Include="Umbraco\Developer\Packages\installer.aspx" />
     <Content Include="Umbraco\Logout.aspx" />
     <Content Include="Umbraco\umbraco.aspx" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.unobtrusive-ajax.min.js" />
@@ -668,9 +633,6 @@
     <None Include="Config\EmbeddedMedia.Release.config">
       <DependentUpon>EmbeddedMedia.config</DependentUpon>
     </None>
-    <None Include="Config\UrlRewriting.Release.config">
-      <DependentUpon>UrlRewriting.config</DependentUpon>
-    </None>
     <None Include="Config\umbracoSettings.Release.config">
       <DependentUpon>umbracoSettings.config</DependentUpon>
       <SubType>Designer</SubType>
@@ -753,7 +715,6 @@
     <Content Include="Umbraco\Images\thumbs_med.png" />
     <Content Include="Umbraco\Images\thumbs_smll.png" />
     <Content Include="Umbraco\Images\Umbraco\settingView.gif" />
-    <Content Include="Umbraco\Settings\Views\EditView.aspx" />
     <Content Include="Umbraco_Client\Application\Extensions.js" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.validate.min.js" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.validate.unobtrusive.min.js" />
@@ -1572,7 +1533,6 @@
     <Content Include="Umbraco_Client\Installer\Js\jquery.ui.selectmenu.js" />
     <Content Include="Umbraco\Config\Lang\ko.xml" />
     <Content Include="Umbraco\Dashboard\FeedProxy.aspx" />
-    <Content Include="Umbraco\Developer\Packages\StarterKits.aspx" />
     <Content Include="Umbraco\helpRedirect.aspx" />
     <Content Include="Umbraco\Images\aboutNew.png" />
     <Content Include="Umbraco\Images\Editor\skin.gif" />
@@ -1742,7 +1702,6 @@
     <Content Include="Umbraco_Client\Tree\Themes\Umbraco\li.gif" />
     <Content Include="Umbraco_Client\Tree\Themes\Umbraco\style.css" />
     <Content Include="Umbraco_Client\Tree\Themes\Umbraco\throbber.gif" />
-    <Content Include="Umbraco\Developer\Packages\proxy.htm" />
     <Content Include="Umbraco\Developer\Xslt\xsltVisualize.aspx" />
     <Content Include="Umbraco\Dialogs\empty.htm" />
     <Content Include="Umbraco\Dialogs\insertMasterpageContent.aspx" />
@@ -1809,12 +1768,8 @@
     <Content Include="Umbraco\Images\Umbraco\repository.gif" />
     <Content Include="Umbraco\Images\Umbraco\uploadpackage.gif" />
     <Content Include="Umbraco_Client\Application\JQuery\jquery.autocomplete.js" />
-    <Content Include="Umbraco\Developer\Packages\BrowseRepository.aspx" />
     <Content Include="Umbraco\Developer\Packages\directoryBrowser.aspx" />
     <Content Include="Umbraco\Developer\Packages\editPackage.aspx" />
-    <Content Include="Umbraco\Developer\Packages\installedPackage.aspx" />
-    <Content Include="Umbraco\Developer\Packages\LoadNitros.ascx" />
-    <Content Include="Umbraco\Developer\Packages\SubmitPackage.aspx" />
     <Content Include="Umbraco\Dialogs\about.aspx" />
     <Content Include="Umbraco\Dialogs\AssignDomain.aspx" />
     <Content Include="Umbraco\Dialogs\create.aspx" />
@@ -1827,7 +1782,6 @@
     <Content Include="Umbraco\Dialogs\insertTable.aspx" />
     <Content Include="Umbraco\Dialogs\moveOrCopy.aspx" />
     <Content Include="Umbraco\Dialogs\notifications.aspx" />
-    <Content Include="Umbraco\Developer\Packages\installer.aspx" />
     <Content Include="Umbraco\Dialogs\protectPage.aspx" />
     <Content Include="Umbraco\Dialogs\publish.aspx" />
     <Content Include="Umbraco\Dialogs\RegexWs.aspx" />
@@ -2385,7 +2339,6 @@
     <Content Include="Config\umbracoSettings.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="Config\UrlRewriting.config" />
     <Content Include="Config\log4net.config" />
     <Content Include="Config\FileSystemProviders.config" />
     <Content Include="Config\EmbeddedMedia.config" />
@@ -2423,9 +2376,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7514</DevelopmentServerPort>
+          <DevelopmentServerPort>7610</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7514</IISUrl>
+          <IISUrl>http://localhost:7610</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
@@ -2435,6 +2388,8 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="$(MSBuildProjectDirectory)\..\umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) != true" />
+  <Import Project="$(SolutionDir)umbraco.presentation.targets" Condition="$(BuildingInsideVisualStudio) == true" />
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>

src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml

@@ -676,7 +676,7 @@
   <area alias="publicAccess">
     <key alias="paAdvanced">Ochrana prostřednictvím rolí</key>
     <key alias="paAdvancedHelp"><![CDATA[Pokud si přejete řídit přístup ke stránce za použití autentizace prostřednictvím rolí,<br /> použijte členské skupiny umbraca.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Musíte vytvořit členskou skupinu před tím, než můžete použít <br />autentizaci prostřednictvím rolí]]></key>
+    <key alias="paAdvancedNoGroups">Musíte vytvořit členskou skupinu před tím, než můžete použít autentizaci prostřednictvím rolí</key>
     <key alias="paErrorPage">Chybová stránka</key>
     <key alias="paErrorPageHelp">Použita, když jsou lidé přihlášení, ale nemají přístup</key>
     <key alias="paHowWould">Vyberte, jak omezit přístup k této stránce</key>

src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml

@@ -633,7 +633,7 @@ Vennlig hilsen Umbraco roboten
   <area alias="publicAccess">
     <key alias="paAdvanced">Avansert: Beskytt ved å velge hvilke brukergrupper som har tilgang til siden</key>
     <key alias="paAdvancedHelp"><![CDATA[Om du ønsker å kontrollere tilgang til siden ved å bruke rolle-basert autentisering,<br /> ved å bruke Umbraco's medlems-grupper]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Du må opprette en medlemsgruppe før du kan bruke <br /> rollebasert autentikasjon.]]></key>
+    <key alias="paAdvancedNoGroups">Du må opprette en medlemsgruppe før du kan bruke rollebasert autentikasjon.</key>
     <key alias="paErrorPage">Feilside</key>
     <key alias="paErrorPageHelp">Brukt når personer logger på, men ikke har tilgang</key>
     <key alias="paHowWould">Hvordan vil du beskytte siden din?</key>

src/Umbraco.Web.UI/config/Dashboard.config

@@ -119,4 +119,4 @@
       </control>
     </tab>
   </section>
-</dashBoard>
+</dashBoard>

src/Umbraco.Web.UI/config/UrlRewriting.Release.config

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<urlrewritingnet xmlns="http://www.urlrewriting.net/schemas/config/2006/07">
-  <rewrites>
-    <!-- 
-		URLRewriting.net is obsolete and will be removed from Umbraco in the future.
-		If you want to do rewrites, make sure to use IIS URL rewrite: https://www.iis.net/downloads/microsoft/url-rewrite
-		The advantage of using IIS rewrite is that it is much faster, much less CPU intensive and much less memory intensive.
-	-->
-  </rewrites>
-</urlrewritingnet>

src/Umbraco.Web.UI/config/UrlRewriting.config

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<urlrewritingnet xmlns="http://www.urlrewriting.net/schemas/config/2006/07">
-  <rewrites>
-    <!-- 
-		URLRewriting.net is obsolete and will be removed from Umbraco in the future.
-		If you want to do rewrites, make sure to use IIS URL rewrite: https://www.iis.net/downloads/microsoft/url-rewrite
-		The advantage of using IIS rewrite is that it is much faster, much less CPU intensive and much less memory intensive.
-	-->
-  </rewrites>
-</urlrewritingnet>

src/Umbraco.Web.UI/config/log4net.Release.config

@@ -18,7 +18,7 @@
     <encoding value="utf-8" />
   </appender>
 
-  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core">
+  <appender name="AsynchronousLog4NetAppender" type="Log4Net.Async.ParallelForwardingAppender,Log4Net.Async">
     <appender-ref ref="rollingFile" />
   </appender>
 

src/Umbraco.Web.UI/config/log4net.config

@@ -18,7 +18,7 @@
     <encoding value="utf-8" />
   </appender>
 
-  <appender name="AsynchronousLog4NetAppender" type="Umbraco.Core.Logging.ParallelForwardingAppender,Umbraco.Core">
+  <appender name="AsynchronousLog4NetAppender" type="Log4Net.Async.ParallelForwardingAppender,Log4Net.Async">
     <appender-ref ref="rollingFile" />
   </appender>
 

src/Umbraco.Web.UI/config/tinyMceConfig.Release.config

@@ -27,7 +27,6 @@
     <command>
       <umbracoAlias>undo</umbracoAlias>
       <name>Undo</name>
-      <name>Remove Format</name>
       <icon>images/editor/undo.gif</icon>
       <tinyMceCommand value="" userInterface="false" frontendCommand="undo">undo</tinyMceCommand>
       <priority>11</priority>
@@ -233,7 +232,6 @@
     <plugin loadOnFrontend="true">code</plugin>
     <plugin loadOnFrontend="true">codemirror</plugin>
     <plugin loadOnFrontend="true">paste</plugin>
-    <plugin loadOnFrontend="true">umbracolink</plugin>
     <plugin loadOnFrontend="true">anchor</plugin>
     <plugin loadOnFrontend="true">charmap</plugin>
     <plugin loadOnFrontend="true">table</plugin>
@@ -241,7 +239,7 @@
     <plugin loadOnFrontend="true">hr</plugin>
   </plugins>
   <validElements>
-    <![CDATA[+a[id|style|rel|data-id|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
+    <![CDATA[+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
 ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],
 -strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],
 img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],

src/Umbraco.Web.UI/config/tinyMceConfig.config

@@ -239,7 +239,7 @@
     <plugin loadOnFrontend="true">hr</plugin>
   </plugins>
   <validElements>
-    <![CDATA[+a[id|style|rel|data-id|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
+    <![CDATA[+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
 ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],
 -strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],
 img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],

src/Umbraco.Web.UI/config/trees.Release.config

@@ -11,10 +11,10 @@
   <!--Settings-->
   <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
   <add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />  
+  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, umbraco" sortOrder="2" />  
   <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
-  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
+  <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
   <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
   <add initialize="true" sortOrder="7" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
@@ -25,7 +25,7 @@
   <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />  
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
   
   <!--Users-->
   <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />

src/Umbraco.Web.UI/config/trees.config

@@ -9,10 +9,10 @@
   <!--Settings-->
   <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
   <add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
+  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, umbraco" sortOrder="2" />
   <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
-  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
+  <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
   <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
   <add initialize="true" sortOrder="7" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
@@ -22,7 +22,7 @@
   <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
   <!--Users-->
   <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
   <add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
@@ -41,5 +41,4 @@
   <add initialize="true" sortOrder="0" alias="form" application="forms" title="Forms" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.FormTreeController, Umbraco.Forms.Web" />
   <add initialize="true" sortOrder="3" alias="prevaluesource" application="forms" title="Prevalue sources" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.PreValueSourceTreeController, Umbraco.Forms.Web" />
   <add initialize="true" sortOrder="3" alias="formsecurity" application="users" title="Forms Security" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.FormSecurityTreeController, Umbraco.Forms.Web" />
-  
 </trees>

src/Umbraco.Web.UI/config/umbracoSettings.Release.config

@@ -55,6 +55,12 @@
 
     <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
     <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
+
+    <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
+    <EnablePropertyValueConverters>true</EnablePropertyValueConverters>
+	
+    <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
+    <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
   </content>
 
   <security>

src/Umbraco.Web.UI/config/umbracoSettings.config

@@ -104,7 +104,15 @@
 
     <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
     <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
+
+    <showDeprecatedPropertyEditors>false</showDeprecatedPropertyEditors>
     
+    <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
+    <EnablePropertyValueConverters>true</EnablePropertyValueConverters>	
+    
+    <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
+    <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
+	
   </content>
 
   <security>
@@ -115,8 +123,8 @@
     <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
     
     <!-- set to true to enable the UI and API to allow back-office users to reset their passwords -->
-    <allowPasswordReset>true</allowPasswordReset>  
-    
+    <allowPasswordReset>true</allowPasswordReset>
+
   </security>
 
   <requestHandler>
@@ -310,10 +318,10 @@
         Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
         path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
   -->
-  <web.routing
-    trySkipIisCustomErrors="false"
-    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false"
-    umbracoApplicationUrl="">
+  <web.routing
+    trySkipIisCustomErrors="false"
+    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false"
+    umbracoApplicationUrl="">
   </web.routing>
 
 </settings>

src/Umbraco.Web.UI/packages.config

@@ -3,12 +3,12 @@
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
-  <package id="dotless" version="1.4.1.0" targetFramework="net45" />
+  <package id="dotless" version="1.5.2" targetFramework="net45" />
   <package id="Examine" version="0.1.82" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.2" targetFramework="net45" />
-  <package id="ImageProcessor.Web" version="4.8.2" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.5.3" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="4.8.3" targetFramework="net45" />
   <package id="ImageProcessor.Web.Config" version="2.3.0" targetFramework="net45" />
-  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net45" />
+  <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
@@ -30,13 +30,12 @@
   <package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
-  <package id="MySql.Data" version="6.9.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+  <package id="MySql.Data" version="6.9.9" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
   <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
   <package id="Umbraco.ModelsBuilder" version="3.0.7" targetFramework="net45" />
-  <package id="UrlRewritingNet.UrlRewriter" version="2.0.7" targetFramework="net45" />
 </packages>

src/Umbraco.Web.UI/umbraco/Install/Legacy/LoadStarterKits.ascx.cs

@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Routing;
-using System.Web.UI;
-using Umbraco.Core.Logging;
-using Umbraco.Web.Install;
-
-namespace Umbraco.Web.UI.Install.Steps.Skinning
-{
-    public delegate void StarterKitInstalledEventHandler();
-
-    public partial class LoadStarterKits : UserControl
-    {
-        /// <summary>
-        /// Returns the string for the package installer web service base url
-        /// </summary>
-        protected string PackageInstallServiceBaseUrl { get; private set; }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            //Get the URL for the package install service base url
-            var umbracoPath = Core.Configuration.GlobalSettings.UmbracoMvcArea;
-            var urlHelper = new UrlHelper(Context.Request.RequestContext);
-            //PackageInstallServiceBaseUrl = urlHelper.Action("Index", "InstallPackage", new { area = "UmbracoInstall" });
-            PackageInstallServiceBaseUrl = urlHelper.GetUmbracoApiService("Index", "InstallPackage", "UmbracoInstall");
-        }
-
-        /// <summary>
-		/// Flag to show if we can connect to the repo or not
-		/// </summary>
-		protected bool CannotConnect { get; private set; }
-
-		public event StarterKitInstalledEventHandler StarterKitInstalled;
-
-		protected virtual void OnStarterKitInstalled()
-		{
-			StarterKitInstalled();
-		}
-
-
-		private readonly global::umbraco.cms.businesslogic.packager.repositories.Repository _repo;
-        private const string RepoGuid = "65194810-1f85-11dd-bd0b-0800200c9a66";
-
-        public LoadStarterKits()
-		{
-            _repo = global::umbraco.cms.businesslogic.packager.repositories.Repository.getByGuid(RepoGuid);
-		}
-
-		protected void Page_Load(object sender, EventArgs e)
-		{
-
-		}
-
-        //protected void NextStep(object sender, EventArgs e)
-        //{
-        //    var p = (Default)this.Page;
-        //    //InstallHelper.RedirectToNextStep(Page, Request.GetItemAsString("installStep"));
-        //}
-
-		protected override void OnInit(EventArgs e)
-		{
-			base.OnInit(e);
-
-            if (_repo == null)
-            {
-                throw new InvalidOperationException("Could not find repository with id " + RepoGuid);
-            }
-
-			//clear progressbar cache
-            //InstallHelper.ClearProgress();
-
-			if (_repo.HasConnection())
-			{
-				try
-				{
-                    var r = new org.umbraco.our.Repository();
-
-                    rep_starterKits.DataSource = r.Modules();
-					rep_starterKits.DataBind();
-				}
-				catch (Exception ex)
-				{
-					LogHelper.Error<LoadStarterKits>("Cannot connect to package repository", ex);
-					CannotConnect = true;
-
-				}
-			}
-			else
-			{
-				CannotConnect = true;
-			}
-		}
-
-
-		protected void GotoLastStep(object sender, EventArgs e)
-		{
-            //InstallHelper.RedirectToLastStep(Page);
-		}
-
-    }
-}

src/Umbraco.Web.UI/umbraco/Install/Legacy/LoadStarterKits.ascx.designer.cs

@@ -1,60 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Install.Steps.Skinning {
-    
-    
-    public partial class LoadStarterKits {
-        
-        /// <summary>
-        /// pl_loadStarterKits control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.PlaceHolder pl_loadStarterKits;
-        
-        /// <summary>
-        /// JsInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-        
-        /// <summary>
-        /// rep_starterKits control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Repeater rep_starterKits;
-        
-        /// <summary>
-        /// LinkButton1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton LinkButton1;
-        
-        /// <summary>
-        /// LinkButton2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton LinkButton2;
-    }
-}

src/Umbraco.Web.UI/umbraco/Install/Legacy/loadStarterKits.ascx

@@ -1,98 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="LoadStarterKits.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.Skinning.LoadStarterKits" %>
-<%@ Import Namespace="Umbraco.Web.org.umbraco.our" %>
-
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-
-<asp:PlaceHolder ID="pl_loadStarterKits" runat="server">
-    
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="installer/js/PackageInstaller.js" PathNameAlias="UmbracoClient" />
-
-    <% if (!CannotConnect) { %>
-    <script type="text/javascript">
-        (function ($) {
-            $(document).ready(function () {
-                var installer = new Umbraco.Installer.PackageInstaller({
-                    starterKits: $("a.selectStarterKit"),
-                    baseUrl: "<%= PackageInstallServiceBaseUrl %>",
-                    serverError: $("#serverError"),
-                    connectionError: $("#connectionError"),
-                    setProgress: updateProgressBar,
-                    setStatusMessage: updateStatusMessage
-                });
-                installer.init();
-            });
-        })(jQuery);
-    </script>
-    <% } %>
-        <div id="starter-kit-progress" style="display: none;">
-        <h2>Installation in progress...</h2>
-        <div class="loader">
-            <div class="hold">
-                <div class="progress-bar">
-                </div>
-                <span class="progress-bar-value">0%</span>
-            </div>
-            <strong></strong>
-        </div>
-    </div>
-    <asp:Repeater ID="rep_starterKits" runat="server">
-        <headertemplate>
-            <ul class="thumbnails">
-        </headertemplate>
-        <itemtemplate>
-            <li class="span4 add-<%# ((Package)Container.DataItem).Text.Replace(" ","").ToLower() %>">
-                <div class="thumbnail" style="margin-right: 10px; height: 260px">
-                    <img src="http://our.umbraco.org<%# ((Package)Container.DataItem).Thumbnail %>?width=170" alt="<%# ((Package)Container.DataItem).Text %>">
-                    
-                    <h4><%# ((Package)Container.DataItem).Text %></h4>
-                    <%# ((Package)Container.DataItem).Description %>
-                    
-                    <a href="#" class="btn btn-success single-tab selectStarterKit" data-name="<%# ((Package)Container.DataItem).Text %>" title="Install <%# ((Package)Container.DataItem).Text %>" data-repoid="<%# ((Package)Container.DataItem).RepoGuid %>">
-                        Install 
-                    </a>
-                </div>
-            </li>
-        </itemtemplate>
-        <footertemplate>
-                </ul>
-            <%--<asp:LinkButton runat="server" ID="declineStarterKits" CssClass="declineKit" OnClientClick="return confirm('Are you sure you do not want to install a starter kit?');" OnClick="NextStep">
-                    No thanks, do not install a starterkit!
-            </asp:LinkButton>--%>
-        </footertemplate>
-    </asp:Repeater>
-
-</asp:PlaceHolder>
-
-<div id="connectionError" style="<%= CannotConnect ? "" : "display:none;" %>">
-    
-    <div style="padding: 0 100px 13px 5px;">
-        <h2>Oops...the installer can't connect to the repository</h2>
-        Starter Kits could not be fetched from the repository as there was no connection - which can occur if you are using a proxy server or firewall with certain configurations,
-            or if you are not currently connected to the internet.
-            <br />
-        Click <strong>Continue</strong> to complete the installation then navigate to the Developer section of your Umbraco installation
-            where you will find the Starter Kits listed in the Packages tree.
-    </div>
-
-    <!-- btn box -->
-    <footer class="btn-box">
-        <div class="t">&nbsp;</div>
-        <asp:LinkButton ID="LinkButton1" class="btn-step btn btn-continue" runat="server" OnClick="GotoLastStep"><span>Continue</span></asp:LinkButton>
-    </footer>
-
-</div>
-
-<div id="serverError" style="display:none;">
-    
-    <div style="padding: 0 100px 13px 5px;">
-        <h2>Oops...the installer encountered an error</h2>
-        <div class="error-message"></div>
-    </div>
-
-    <!-- btn box -->
-    <footer class="btn-box">
-        <div class="t">&nbsp;</div>
-        <asp:LinkButton ID="LinkButton2" class="btn-step btn btn-continue" runat="server" OnClick="GotoLastStep"><span>Continue</span></asp:LinkButton>
-    </footer>
-
-</div>

src/Umbraco.Web.UI/umbraco/config/lang/da.xml

@@ -150,7 +150,7 @@
     <key alias="releaseDate">Udgivelsesdato</key>
     <key alias="unpublishDate">Dato for Fortryd udgivelse</key>
     <key alias="removeDate">Fjern dato</key>
-    <key alias="sortDone">Sorteringrækkefølgen er opdateret</key>
+    <key alias="sortDone">Sorteringsrækkefølgen er opdateret</key>
     <key alias="sortHelp">For at sortere, træk siderne eller klik på en af kolonnehovederne. Du kan vælge flere sider ved at holde "shift" eller "control" nede mens du vælger.</key>
     <key alias="statistics">Statistik</key>
     <key alias="titleOptional">Titel (valgfri)</key>
@@ -184,7 +184,7 @@
     <key alias="updateData">Vælg en type og skriv en titel</key>
     <key alias="noDocumentTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte dokument typer. Du skal tillade disse i indstillinger under <strong>"dokument typer"</strong>.]]></key>
     <key alias="noMediaTypes" version="7.0"><![CDATA[Der kunne ikke findes nogen tilladte media typer. Du skal tillade disse i indstillinger under <strong>"media typer"</strong>.]]></key>
-    <key alias="documentTypeWithoutTemplate">Dokument type uden skabelon</key>
+    <key alias="documentTypeWithoutTemplate">Dokumenttype uden skabelon</key>
     <key alias="newFolder">Ny mappe</key>
     <key alias="newDataType">Ny datatype</key>
   </area>
@@ -291,6 +291,7 @@
     <key alias="selectMember">Vælg medlem</key>
     <key alias="selectMemberGroup">Vælg medlemsgruppe</key>
     <key alias="noMacroParams">Der er ingen parametre for denne makro</key>
+    <key alias="noMacros">Der er ikke tilføjet nogen makroer</key>
     <key alias="linkYour">Link dit</key>
     <key alias="unLinkYour">Fjern link fra dit</key>
     <key alias="account">konto</key>
@@ -320,6 +321,7 @@
     <key alias="search">Søg...</key>
     <key alias="filter">Filtrer...</key>
     <key alias="enterTags">Indtast nøgleord (tryk på Enter efter hvert nøgleord)...</key>
+    <key alias="usernameHint">Dit brugernavn er typisk din e-mail adresse</key>
   </area>
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Tillad på rodniveau</key>
@@ -525,6 +527,16 @@
 
     <key alias="toggleListView">Brug listevisning</key>
     <key alias="toggleAllowAsRoot">Tillad på rodniveau</key>
+
+    <key alias="commentLine">Comment/Uncomment lines</key>
+    <key alias="removeLine">Remove line</key>
+    <key alias="copyLineUp">Copy Lines Up</key>
+    <key alias="copyLineDown">Copy Lines Down</key>
+    <key alias="moveLineUp">Move Lines Up</key>
+    <key alias="moveLineDown">Move Lines Down</key>
+
+    <key alias="generalHeader">General</key>
+    <key alias="editorHeader">Editor</key>
   </area>
 
   <area alias="graphicheadline">
@@ -568,13 +580,13 @@
     <key alias="permissionsAffectedFolders">Berørte filer og foldere</key>
     <key alias="permissionsAffectedFoldersMoreInfo">Flere informationer om at opsætte rettigheder for Umbraco her</key>
     <key alias="permissionsAffectedFoldersText">Du er nødt til at give ASP.NET 'modify' rettigheder på følgende filer/foldere</key>
-    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Dine rettighedsinstillinger er næsten perfekte!</strong><br/><br/>Du kan køre Umbraco uden problemer, men du vil ikke være i stand til at installere pakker, som er anbefalet for at få fuldt udbytte af Umbraco.]]></key>
+    <key alias="permissionsAlmostPerfect"><![CDATA[<strong>Dine rettighedsindstillinger er næsten perfekte!</strong><br/><br/>Du kan køre Umbraco uden problemer, men du vil ikke være i stand til at installere pakker, som er anbefalet for at få fuldt udbytte af Umbraco.]]></key>
     <key alias="permissionsHowtoResolve">Hvorledes besluttes</key>
     <key alias="permissionsHowtoResolveLink">Klik her for at læse tekstversionen</key>
     <key alias="permissionsHowtoResolveText"><![CDATA[Se vores <strong>video tutorials</strong> om at opsætte folderrettigheder for Umbraco eller læs tekstversionen.]]></key>
-    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Dine rettighedsinstillinger kan være et problem!</strong><br/><br/>Du kan afvikle Umbraco uden problemer, men du vil ikke være i stand til at oprette foldere eller installere pakker, hvilket er anbefalet for at få fuldt udbytte af Umbraco.]]></key>
-    <key alias="permissionsNotReady"><![CDATA[<strong>Dine rettighedsinstillinger er ikke klar til Umbraco!</strong><br/><br/>For at afvikle Umbraco er du nødt til at opdatere dine rettighedsinstillinger.]]></key>
-    <key alias="permissionsPerfect"><![CDATA[<strong>Dine rettighedsinstillinger er perfekte!</strong><br/><br/>Du er nu parat til at afvikle Umbraco og installere pakker!]]></key>
+    <key alias="permissionsMaybeAnIssue"><![CDATA[<strong>Dine rettighedsindstillinger kan være et problem!</strong><br/><br/>Du kan afvikle Umbraco uden problemer, men du vil ikke være i stand til at oprette foldere eller installere pakker, hvilket er anbefalet for at få fuldt udbytte af Umbraco.]]></key>
+    <key alias="permissionsNotReady"><![CDATA[<strong>Dine rettighedsindstillinger er ikke klar til Umbraco!</strong><br/><br/>For at afvikle Umbraco er du nødt til at opdatere dine rettighedsindstillinger.]]></key>
+    <key alias="permissionsPerfect"><![CDATA[<strong>Dine rettighedsindstillinger er perfekte!</strong><br/><br/>Du er nu parat til at afvikle Umbraco og installere pakker!]]></key>
     <key alias="permissionsResolveFolderIssues">Løser folder problem</key>
     <key alias="permissionsResolveFolderIssuesLink">Følg dette link for mere information om udfordringer med ASP.NET og oprettelse af foldere</key>
     <key alias="permissionsSettingUpPermissions">Sætter folderrettigheder op</key>
@@ -586,7 +598,7 @@
     <key alias="runwayInstalledText"><![CDATA[Du har fundamentet på plads. Vælg hvilke moduler du ønsker at installere ovenpå det.<br/>Dette er vores liste over anbefalede moduler. Kryds dem af du ønsker at installere eller se den <a href="#" onclick="toggleModules(); return false;" id="toggleModuleList">fulde liste af moduler</a>  ]]></key>
     <key alias="runwayOnlyProUsers">Kun anbefalet for erfarne brugere</key>
     <key alias="runwaySimpleSite">Jeg ønsker at begynder med et simpelt website</key>
-    <key alias="runwaySimpleSiteText"><![CDATA[<p>"Runway" er et simpelt website som stiller nogle basale dokumenttyper og skabeloner til rådighed. Instaleringsprogrammet kan automatisk opsætte Runway for dig, men du kan nemt redigere, udvide eller fjerne det. Det er ikke nødvendigt og du kan sagtens bruge Umbraco uden. Men Runway tilbyder et fundament, som er baseret på 'Best Practices', som får dig igang hurtigere end nogensinde før. Hvis du vælger at installere Runway, kan du efter eget valg vælge de grundlæggende byggesten kaldet 'Runway Modules' til at forbedre dine Runway-sider.</p><p><small><em>Inkluderet med Runway:</em>Home Page, Getting Started page, Installing Modules page.<br /> <em>Valgfri Moduler:</em> Top Navigation, Sitemap, Contact, Gallery. </small></p>]]></key>
+    <key alias="runwaySimpleSiteText"><![CDATA[<p>"Runway" er et simpelt website som stiller nogle basale dokumenttyper og skabeloner til rådighed. Installeringsprogrammet kan automatisk opsætte Runway for dig, men du kan nemt redigere, udvide eller fjerne det. Det er ikke nødvendigt og du kan sagtens bruge Umbraco uden. Men Runway tilbyder et fundament, som er baseret på 'Best Practices', som får dig igang hurtigere end nogensinde før. Hvis du vælger at installere Runway, kan du efter eget valg vælge de grundlæggende byggesten kaldet 'Runway Modules' til at forbedre dine Runway-sider.</p><p><small><em>Inkluderet med Runway:</em>Home Page, Getting Started page, Installing Modules page.<br /> <em>Valgfri Moduler:</em> Top Navigation, Sitemap, Contact, Gallery. </small></p>]]></key>
     <key alias="runwayWhatIsRunway">Hvad er Runway</key>
     <key alias="step1">Skridt 1/5: Acceptér licens</key>
     <key alias="step2">Skridt 2/5: Database-konfiguration</key>
@@ -703,7 +715,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="packageRepository">Pakke opbevaringsbase</key>
     <key alias="packageUninstallConfirm">Bekræft af-installering</key>
     <key alias="packageUninstalledHeader">Pakken blev fjernet</key>
-    <key alias="packageUninstalledText">Pakken er på succefuld vis blevet fjernet</key>
+    <key alias="packageUninstalledText">Pakken er på succesfuld vis blevet fjernet</key>
     <key alias="packageUninstallHeader">Afinstallér pakke</key>
     <key alias="packageUninstallText">
       <![CDATA[Du kan fjerne markeringen på elementer du ikke ønsker at fjerne, på dette tidspunkt, nedenfor. Når du klikker 'bekræft' vil alle afkrydsede elemenet blive fjernet <br/>
@@ -725,7 +737,7 @@ Mange hilsner fra Umbraco robotten
   <area alias="publicAccess">
     <key alias="paAdvanced">Rollebaseret beskyttelse</key>
     <key alias="paAdvancedHelp">Hvis du ønsker at kontrollere adgang til siden ved hjælp af rollebaseret godkendelse via Umbracos medlemsgrupper.</key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Du skal oprette en medlemsgruppe før du kan bruge <br />rollebaseret godkendelse]]></key>
+    <key alias="paAdvancedNoGroups">Du skal oprette en medlemsgruppe før du kan bruge rollebaseret godkendelse</key>
     <key alias="paErrorPage">Fejlside</key>
     <key alias="paErrorPageHelp">Brugt når folk er logget ind, men ingen adgang</key>
     <key alias="paHowWould">Vælg hvordan siden skal beskyttes</key>
@@ -784,7 +796,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="addRows">Tilføj række</key>
     <key alias="addElement">Tilføj indhold</key>
     <key alias="dropElement">Slip indhold</key>
-    <key alias="settingsApplied">Instillinger tilføjet</key>
+    <key alias="settingsApplied">Indstillinger tilføjet</key>
 
     <key alias="contentNotAllowed">Indholdet er ikke tilladt her</key>
     <key alias="contentAllowed">Indholdet er tilladt her</key>
@@ -929,7 +941,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="tab">Faneblad</key>
     <key alias="tabname">Titel på faneblad</key>
     <key alias="tabs">Faneblade</key>
-    <key alias="masterDocumentType">Master Dokument Type</key>
+    <key alias="masterDocumentType">Master Dokumenttype</key>
     <key alias="createMatchingTemplate">Opret matchende skabelon</key>
   </area>
   <area alias="sort">
@@ -1004,17 +1016,117 @@ Mange hilsner fra Umbraco robotten
     <key alias="preview">Vis prøve</key>
     <key alias="styles">Styles</key>
   </area>
+
   <area alias="template">
     <key alias="edittemplate">Rediger skabelon</key>
+
+    <key alias="insertSections">Sektioner</key>
     <key alias="insertContentArea">Indsæt indholdsområde</key>
-    <key alias="insertContentAreaPlaceHolder">Indsæt indholdsområdemarkering</key>
-    <key alias="insertDictionaryItem">Indsæt ordbogselement</key>
-    <key alias="insertMacro">Indsæt makro</key>
-    <key alias="insertPageField">Indsæt Umbraco sidefelt</key>
+    <key alias="insertContentAreaPlaceHolder">Indsæt pladsholder for indholdsområde</key>
+
+    <key alias="insert">Indsæt</key>
+    <key alias="insertDesc">Hvad vil du indsætte?</key>
+
+    <key alias="insertDictionaryItem">Oversættelse</key>
+    <key alias="insertDictionaryItemDesc">Indsætter en oversætbar tekst, som skifter efter det sprog, som websitet vises i.</key>
+
+    <key alias="insertMacro">Makro</key>
+    <key alias="insertMacroDesc">
+      En makro er et element, som kan have forskellige indstillinger, når det indsættes. 
+      Brug det som en genbrugelig del af dit design såsom gallerier, formularer og lister.
+    </key>
+
+    <key alias="insertPageField">Sideværdi</key>
+    <key alias="insertPageFieldDesc">
+      Viser værdien af et felt fra den nuværende side. Kan indstilles til at bruge rekursive værdier eller 
+      vise en standardværdi i tilfælde af, at feltet er tomt.
+    </key>
+
+    <key alias="insertPartialView">Partial view</key>
+    <key alias="insertPartialViewDesc">
+      Et Partial View er et skabelonelement, som kan indsættes i andre skabeloner og derved 
+      genbruges og deles på tværs af sideskabelonerne.
+    </key>
+
     <key alias="mastertemplate">Master skabelon</key>
-    <key alias="quickGuide">Lynguide til Umbracos skabelontags</key>
+    <key alias="noMastertemplate">Ingen masterskabelon</key>
+    <key alias="noMaster">Ingen master</key>
+
+    <key alias="renderBody">Indsæt en underliggende skabelon</key>
+    <key alias="renderBodyDesc">
+      <![CDATA[
+      Henter indholdet af en underliggende skabelon ind, ved at 
+      indsætte et <code>@RenderBody()</code> element.
+      ]]>
+    </key>
+
+
+    <key alias="defineSection">Definer en sektion</key>
+    <key alias="defineSectionDesc">
+      <![CDATA[
+         Definerer en del af din skabelon som en navngivet sektion, ved at 
+         omkranse den i <code>@section { ... }</code>. Herefter kan denne sektion flettes ind i 
+         overliggende skabelon ved at indsætte et <code>@RenderSection</code> element.
+      ]]>
+    </key>
+
+    <key alias="renderSection">Indsæt en sektion</key>
+    <key alias="renderSectionDesc">
+      <![CDATA[
+      Henter indholdet af en sektion fra den underliggende skabelon ind, ved at indsætte et 
+      <code>@RenderSection(name)</code> element. Den underliggende skabelon skal have 
+      defineret en sektion via et <code>@section [name]{ ... }</code> element.
+      ]]>
+    </key>
+
+    <key alias="sectionName">Sektionsnavn</key>
+    <key alias="sectionMandatory">Sektionen er obligatorisk</key>
+    
+    <key alias="sectionMandatoryDesc">
+      Hvis obligatorisk, skal underskabelonen indeholde en <code>@section</code> -definition.
+    </key>
+
+
+    <key alias="queryBuilder">Query builder</key>
+    <key alias="itemsReturned">sider returneret, på</key>
+
+    <key alias="iWant">Returner</key>
+    <key alias="allContent">alt indhold</key>
+    <key alias="contentOfType">indhold af typen &quot;%0%&quot;</key>
+    
+    <key alias="from">fra</key>
+    <key alias="websiteRoot">mit website</key>
+    <key alias="where">hvor</key>
+    <key alias="and">og</key>
+
+    <key alias="is">er</key>
+    <key alias="isNot">ikke er</key>
+    <key alias="before">er før</key>
+    <key alias="beforeIncDate">er før (inkl. valgte dato)</key>
+    <key alias="after">er efter</key>
+    <key alias="afterIncDate">er efter (inkl. valgte dato)</key>
+    <key alias="equals">er</key>
+    <key alias="doesNotEqual">ikke er</key>
+    <key alias="contains">indeholder</key>
+    <key alias="doesNotContain">ikke indeholder</key>
+    <key alias="greaterThan">er større end</key>
+    <key alias="greaterThanEqual">er større end eller det samme som</key>
+    <key alias="lessThan">er mindre end</key>
+    <key alias="lessThanEqual">er mindre end eller det samme som</key>
+
+    <key alias="id">Id</key>
+    <key alias="name">Navn</key>
+    <key alias="createdDate">Oprettelsesdato</key>
+    <key alias="lastUpdatedDate">Sidste opdatering</key>
+
+    <key alias="orderBy">Sortér efter</key>
+    <key alias="ascending">stigende rækkefølge</key>
+    <key alias="descending">faldende rækkefølge</key>
+
     <key alias="template">Skabelon</key>
   </area>
+  
+ 
   <area alias="templateEditor">
     <key alias="alternativeField">Alternativt felt</key>
     <key alias="alternativeText">Alternativ tekst</key>

src/Umbraco.Web.UI/umbraco/config/lang/de.xml

@@ -278,6 +278,7 @@
     <key alias="search">Durchsuchen ...</key>
     <key alias="filter">Filtern ...</key>
     <key alias="enterTags">Tippen, um Tags hinzuzufügen (nach jedem Tag die Eingabetaste drücken) ...</key>
+    <key alias="usernameHint">Der Benutzername ist normalerweise Ihre E-Mail-Adresse</key>
   </area>
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Auf oberster Ebene erlauben</key>

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

@@ -100,6 +100,8 @@
     <key alias="styleShow">Show styles</key>
     <key alias="tableInsert">Insert table</key>
     <key alias="generateModels">Generate models</key>
+    <key alias="undo">Undo</key>
+    <key alias="redo">Redo</key>
   </area>
   <area alias="changeDocType">
     <key alias="changeDocTypeInstruction">To change the document type for the selected content, first select from the list of valid types for this location.</key>
@@ -197,6 +199,13 @@
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
     <key alias="newFolder">New folder</key>
     <key alias="newDataType">New data type</key>
+    <key alias="newJavascriptFile">New javascript file</key>
+    <key alias="newEmptyPartialView">New empty partial view</key>
+    <key alias="newPartialViewMacro">New partial view macro</key>
+    <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
+    <key alias="newEmptyPartialViewMacro">New empty partial view macro</key>
+    <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
+    <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Browse your website</key>
@@ -305,6 +314,7 @@
     <key alias="selectMemberGroup">Select member group</key>
     <key alias="noIconsFound">No icons were found</key>
     <key alias="noMacroParams">There are no parameters for this macro</key>
+    <key alias="noMacros">There are no macros available to insert</key>
     <key alias="externalLoginProviders">External login providers</key>
     <key alias="exceptionDetail">Exception Details</key>
     <key alias="stacktrace">Stacktrace</key>
@@ -338,6 +348,7 @@
     <key alias="filter">Type to filter...</key>
     <key alias="enterTags">Type to add tags (press enter after each tag)...</key>
     <key alias="email">Enter your email</key>
+    <key alias="usernameHint">Your username is usually your email</key>
   </area>
   <area alias="editcontenttype">
     <key alias="allowAtRoot" version="7.2">Allow at root</key>
@@ -490,6 +501,8 @@
     <key alias="retry">Retry</key>
     <key alias="rights">Permissions</key>
     <key alias="search">Search</key>
+    <key alias="searchNoResult">Sorry, we can not find what you are looking for</key>
+    <key alias="noItemsInList">No items have been added</key>
     <key alias="server">Server</key>
     <key alias="show">Show</key>
     <key alias="showPageOnSend">Show page on Send</key>
@@ -550,6 +563,16 @@
 
       <key alias="toggleListView">Toggle list view</key>
       <key alias="toggleAllowAsRoot">Toggle allow as root</key>
+
+      <key alias="commentLine">Comment/Uncomment lines</key>
+      <key alias="removeLine">Remove line</key>
+      <key alias="copyLineUp">Copy Lines Up</key>
+      <key alias="copyLineDown">Copy Lines Down</key>
+      <key alias="moveLineUp">Move Lines Up</key>
+      <key alias="moveLineDown">Move Lines Down</key>
+    
+      <key alias="generalHeader">General</key>
+      <key alias="editorHeader">Editor</key>
   </area>
 
   <area alias="graphicheadline">
@@ -828,7 +851,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="publicAccess">
     <key alias="paAdvanced">Role based protection</key>
     <key alias="paAdvancedHelp"><![CDATA[If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[You need to create a membergroup before you can use <br />role-based authentication.]]></key>
+    <key alias="paAdvancedNoGroups">You need to create a membergroup before you can use role-based authentication</key>
     <key alias="paErrorPage">Error Page</key>
     <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
     <key alias="paHowWould">Choose how to restrict access to this page</key>
@@ -1025,17 +1048,112 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="preview">Preview</key>
     <key alias="styles">Styles</key>
   </area>
+  
   <area alias="template">
     <key alias="edittemplate">Edit template</key>
+
+    <key alias="insertSections">Sections</key>
     <key alias="insertContentArea">Insert content area</key>
     <key alias="insertContentAreaPlaceHolder">Insert content area placeholder</key>
-    <key alias="insertDictionaryItem">Insert dictionary item</key>
-    <key alias="insertMacro">Insert Macro</key>
-    <key alias="insertPageField">Insert Umbraco page field</key>
+
+    <key alias="insert">Insert</key>
+    <key alias="insertDesc">Choose what to insert into your template</key>
+    
+    <key alias="insertDictionaryItem">Dictionary item</key>
+    <key alias="insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</key>
+    
+    <key alias="insertMacro">Macro</key>
+    <key alias="insertMacroDesc">
+      A Macro is a configurable component which is great for
+      reusable parts of your design, where you need the option to provide parameters,
+      such as galleries, forms and lists.
+    </key>
+
+    <key alias="insertPageField">Value</key>
+    <key alias="insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</key>
+    
+    <key alias="insertPartialView">Partial view</key>
+    <key alias="insertPartialViewDesc">
+      A partial view is a separate template file which can be rendered inside another
+      template, it's great for reusing markup or for separating complex templates into separate files.
+    </key>
+    
     <key alias="mastertemplate">Master template</key>
-    <key alias="quickGuide">Quick Guide to Umbraco template tags</key>
+    <key alias="noMastertemplate">No master template</key>
+    <key alias="noMaster">No master</key>
+
+    <key alias="renderBody">Render child template</key>
+    <key alias="renderBodyDesc">
+      <![CDATA[
+     Renders the contents of a child template, by inserting a
+     <code>@RenderBody()</code> placeholder.
+      ]]>
+    </key>
+    
+    
+    <key alias="defineSection">Define a named section</key>
+    <key alias="defineSectionDesc">
+      <![CDATA[
+         Defines a part of your template as a named section by wrapping it in
+          <code>@section { ... }</code>. This can be rendered in a
+          specific area of the parent of this template, by using <code>@RenderSection</code>.
+      ]]>
+    </key>
+
+    <key alias="renderSection">Render a named section</key>
+    <key alias="renderSectionDesc">
+      <![CDATA[
+      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
+      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
+      ]]>
+    </key>
+
+    <key alias="sectionName">Section Name</key>
+    <key alias="sectionMandatory">Section is mandatory</key>
+    <key alias="sectionMandatoryDesc">
+      If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown.
+    </key>
+    
+    
+    <key alias="queryBuilder">Query builder</key>
+    <key alias="itemsReturned">items returned, in</key>
+
+    <key alias="iWant">I want</key>   
+    <key alias="allContent">all content</key>
+    <key alias="contentOfType">content of type &quot;%0%&quot;</key>
+    <key alias="from">from</key>
+    <key alias="websiteRoot">my website</key>
+    <key alias="where">where</key>
+    <key alias="and">and</key>
+    
+    <key alias="is">is</key>
+    <key alias="isNot">is not</key>
+    <key alias="before">before</key>
+    <key alias="beforeIncDate">before (including selected date)</key>
+    <key alias="after">after</key>
+    <key alias="afterIncDate">after (including selected date)</key>
+    <key alias="equals">equals</key>
+    <key alias="doesNotEqual">does not equal</key>
+    <key alias="contains">contains</key>
+    <key alias="doesNotContain">does not contain</key>
+    <key alias="greaterThan">greater than</key>
+    <key alias="greaterThanEqual">greater than or equal to</key>
+    <key alias="lessThan">less than</key>
+    <key alias="lessThanEqual">less than or equal to</key>
+
+    <key alias="id">Id</key>
+    <key alias="name">Name</key>
+    <key alias="createdDate">Created Date</key>
+    <key alias="lastUpdatedDate">Last Updated Date</key>
+
+    <key alias="orderBy">order by</key>
+    <key alias="ascending">ascending</key>
+    <key alias="descending">descending</key>    
+    
     <key alias="template">Template</key>
+    
   </area>
+  
   <area alias="grid">
     <key alias="insertControl">Choose type of content</key>
     <key alias="chooseLayout">Choose a layout</key>
@@ -1434,4 +1552,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="enabledConfirm">URL tracker has now been enabled.</key>
     <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
   </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
+  </area>
 </language>

src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml

@@ -199,6 +199,13 @@
     <key alias="documentTypeWithoutTemplate">Document Type without a template</key>
     <key alias="newFolder">New folder</key>
     <key alias="newDataType">New data type</key>
+    <key alias="newJavascriptFile">New javascript file</key>
+    <key alias="newEmptyPartialView">New empty partial view</key>
+    <key alias="newPartialViewMacro">New partial view macro</key>
+    <key alias="newPartialViewFromSnippet">New partial view from snippet</key>
+    <key alias="newEmptyPartialViewMacro">New empty partial view macro</key>
+    <key alias="newPartialViewMacroFromSnippet">New partial view macro from snippet</key>
+    <key alias="newPartialViewMacroNoMacro">New partial view macro (without macro)</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Browse your website</key>
@@ -553,6 +560,16 @@
 
     <key alias="toggleListView">Toggle list view</key>
     <key alias="toggleAllowAsRoot">Toggle allow as root</key>
+
+    <key alias="commentLine">Comment/Uncomment lines</key>
+    <key alias="removeLine">Remove line</key>
+    <key alias="copyLineUp">Copy Lines Up</key>
+    <key alias="copyLineDown">Copy Lines Down</key>
+    <key alias="moveLineUp">Move Lines Up</key>
+    <key alias="moveLineDown">Move Lines Down</key>
+
+    <key alias="generalHeader">General</key>
+    <key alias="editorHeader">Editor</key>
   </area>
   <area alias="graphicheadline">
     <key alias="backgroundcolor">Background color</key>
@@ -828,7 +845,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="publicAccess">
     <key alias="paAdvanced">Role based protection</key>
     <key alias="paAdvancedHelp"><![CDATA[If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[You need to create a membergroup before you can use <br />role-based authentication.]]></key>
+    <key alias="paAdvancedNoGroups">You need to create a membergroup before you can use role-based authentication</key>
     <key alias="paErrorPage">Error Page</key>
     <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
     <key alias="paHowWould">Choose how to restrict access to this page</key>
@@ -1027,13 +1044,105 @@ To manage your website, simply open the Umbraco back office and start adding con
   </area>
   <area alias="template">
     <key alias="edittemplate">Edit template</key>
+
+    <key alias="insertSections">Sections</key>
     <key alias="insertContentArea">Insert content area</key>
     <key alias="insertContentAreaPlaceHolder">Insert content area placeholder</key>
-    <key alias="insertDictionaryItem">Insert dictionary item</key>
-    <key alias="insertMacro">Insert Macro</key>
-    <key alias="insertPageField">Insert Umbraco page field</key>
+
+    <key alias="insert">Insert</key>
+    <key alias="insertDesc">Choose what to insert into your template</key>
+
+    <key alias="insertDictionaryItem">Dictionary item</key>
+    <key alias="insertDictionaryItemDesc">A dictionary item is a placeholder for a translatable piece of text, which makes it easy to create designs for multilingual websites.</key>
+
+    <key alias="insertMacro">Macro</key>
+    <key alias="insertMacroDesc">
+      A Macro is a configurable component which is great for
+      reusable parts of your design, where you need the option to provide parameters,
+      such as galleries, forms and lists.
+    </key>
+
+    <key alias="insertPageField">Value</key>
+    <key alias="insertPageFieldDesc">Displays the value of a named field from the current page, with options to modify the value or fallback to alternative values.</key>
+
+    <key alias="insertPartialView">Partial view</key>
+    <key alias="insertPartialViewDesc">
+      A partial view is a separate template file which can be rendered inside another
+      template, it's great for reusing markup or for separating complex templates into separate files.
+    </key>
+
     <key alias="mastertemplate">Master template</key>
-    <key alias="quickGuide">Quick Guide to Umbraco template tags</key>
+    <key alias="noMastertemplate">No master template</key>
+    <key alias="noMaster">No master</key>
+
+    <key alias="renderBody">Render child template</key>
+    <key alias="renderBodyDesc">
+      <![CDATA[
+     Renders the contents of a child template, by inserting a
+     <code>@RenderBody()</code> placeholder.
+      ]]>
+    </key>
+
+
+    <key alias="defineSection">Define a named section</key>
+    <key alias="defineSectionDesc">
+      <![CDATA[
+         Defines a part of your template as a named section by wrapping it in
+          <code>@section { ... }</code>. This can be rendered in a
+          specific area of the parent of this template, by using <code>@RenderSection</code>.
+      ]]>
+    </key>
+
+    <key alias="renderSection">Render a named section</key>
+    <key alias="renderSectionDesc">
+      <![CDATA[
+      Renders a named area of a child template, by inserting a <code>@RenderSection(name)</code> placeholder.
+      This renders an area of a child template which is wrapped in a corresponding <code>@section [name]{ ... }</code> definition.
+      ]]>
+    </key>
+
+    <key alias="sectionName">Section Name</key>
+    <key alias="sectionMandatory">Section is mandatory</key>
+    <key alias="sectionMandatoryDesc">
+      If mandatory, the child template must contain a <code>@section</code> definition, otherwise an error is shown.
+    </key>
+
+
+    <key alias="queryBuilder">Query builder</key>
+    <key alias="itemsReturned">items returned, in</key>
+
+    <key alias="iWant">I want</key>
+    <key alias="allContent">all content</key>
+    <key alias="contentOfType">content of type &quot;%0%&quot;</key>
+    <key alias="from">from</key>
+    <key alias="websiteRoot">my website</key>
+    <key alias="where">where</key>
+    <key alias="and">and</key>
+
+    <key alias="is">is</key>
+    <key alias="isNot">is not</key>
+    <key alias="before">before</key>
+    <key alias="beforeIncDate">before (including selected date)</key>
+    <key alias="after">after</key>
+    <key alias="afterIncDate">after (including selected date)</key>
+    <key alias="equals">equals</key>
+    <key alias="doesNotEqual">does not equal</key>
+    <key alias="contains">contains</key>
+    <key alias="doesNotContain">does not contain</key>
+    <key alias="greaterThan">greater than</key>
+    <key alias="greaterThanEqual">greater than or equal to</key>
+    <key alias="lessThan">less than</key>
+    <key alias="lessThanEqual">less than or equal to</key>
+
+    <key alias="id">Id</key>
+    <key alias="name">Name</key>
+    <key alias="createdDate">Created Date</key>
+    <key alias="lastUpdatedDate">Last Updated Date</key>
+
+    <key alias="orderBy">order by</key>
+    <key alias="ascending">ascending</key>
+    <key alias="descending">descending</key>
+
     <key alias="template">Template</key>
   </area>
   <area alias="grid">
@@ -1438,4 +1547,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="enabledConfirm">URL tracker has now been enabled.</key>
     <key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
   </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">No Dictionary items to choose from</key>
+  </area>
 </language>

src/Umbraco.Web.UI/umbraco/config/lang/es.xml

@@ -277,6 +277,7 @@
     <key alias="entername">Escribe un nombre...</key>
     <key alias="search">Escribe tu búsqueda...</key>
     <key alias="filter">Escribe para filtrar resultados...</key>
+    <key alias="usernameHint">Tu nombre de usuario normalmente es tu e-mail</key>
   </area>
   <area alias="editcontenttype">
   <key alias="allowAtRoot" version="7.2">Permitir en nodo raíz</key>
@@ -596,7 +597,7 @@
   <area alias="publicAccess">
     <key alias="paAdvanced">Proteccion basada en roles</key>
     <key alias="paAdvancedHelp"><![CDATA[Si desea controlar el acceso a la página usando autenticación basada en roles,<br /> usando los grupos de miembros de Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Necesita crear un grupo de miembros antes de poder usar <br /> autenticación basada en roles.]]></key>
+    <key alias="paAdvancedNoGroups">Necesita crear un grupo de miembros antes de poder usar autenticación basada en roles</key>
     <key alias="paErrorPage">Página de error</key>
     <key alias="paErrorPageHelp">Usada cuando alguien hace login, pero no tiene acceso</key>
     <key alias="paHowWould">Elija cómo restringir el acceso a esta página</key>

src/Umbraco.Web.UI/umbraco/config/lang/fr.xml

@@ -329,6 +329,7 @@
     <key alias="filter">Filtrer...</key>
     <key alias="enterTags">Ajouter des tags (appuyer sur enter entre chaque tag)...</key>
     <key alias="email">Entrez votre email</key>
+    <key alias="usernameHint">Votre nom d'utilisateur est généralement votre adresse email</key>
   </area>
 
   <area alias="editcontenttype">
@@ -817,7 +818,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
   <area alias="publicAccess">
     <key alias="paAdvanced">Protection basée sur les rôles</key>
     <key alias="paAdvancedHelp"><![CDATA[Si vous souhaitez contrôler l'accès à la page en utilisant l'authentification basée sur les rôles utilisateurs,<br /> via les groupes de membres Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Vous devez créer un groupe avant de pouvoir utiliser <br /> l'authentification basée sur les rôles.]]></key>
+    <key alias="paAdvancedNoGroups">Vous devez créer un groupe avant de pouvoir utiliser l'authentification basée sur les rôles</key>
     <key alias="paErrorPage">Page d'erreur</key>
     <key alias="paErrorPageHelp">Utilisé pour les personnes connectées, mais qui n'ont pas accès</key>
     <key alias="paHowWould">Choisissez comment restreindre l'accès à cette page</key>

src/Umbraco.Web.UI/umbraco/config/lang/it.xml

@@ -572,7 +572,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
   <area alias="publicAccess">
     <key alias="paAdvanced"><![CDATA[Protezione basata su ruoli]]></key>
     <key alias="paAdvancedHelp"><![CDATA[Se vuoi controllare gli accessi alla pagina tramite l'autenticazione basata sui ruoli,<br /> usando i gruppi di membri di Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Devi creare un gruppo di membri prima di utilizzare <br />l'autenticazione basata sui ruoli.]]></key>
+    <key alias="paAdvancedNoGroups">Devi creare un gruppo di membri prima di utilizzare l'autenticazione basata sui ruoli</key>
     <key alias="paErrorPage"><![CDATA[Pagina di Errore]]></key>
     <key alias="paErrorPageHelp"><![CDATA[Usato quando qualcuno è connesso, ma non ha accesso]]></key>
     <key alias="paHowWould"><![CDATA[Vuoi restringere l'accesso a questa pagina?]]></key>

src/Umbraco.Web.UI/umbraco/config/lang/nl.xml

@@ -339,6 +339,7 @@
     <key alias="filter">Typ om te filteren...</key>
     <key alias="enterTags">Typ om tags toe te voegen (druk op enter na elke tag)...</key>
 	<key alias="email">Voer jouw email in</key>
+    <key alias="usernameHint">Jouw gebruikersnaam is meestal jouw email</key>
   </area>
 
   <area alias="editcontenttype">
@@ -828,7 +829,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
   <area alias="publicAccess">
     <key alias="paAdvanced">Geavanceerd: Beveilig door de Member Groups te seecteren die toegang hebben op de pagina</key>
     <key alias="paAdvancedHelp"><![CDATA[Als je toegang tot pagina's wilt regelen met behulp van role-based authenticatie,<br /> gebruik makend van Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Je moet eerst een membergroup maken voordat je kunt werken met <br />role-based authentication.]]></key>
+    <key alias="paAdvancedNoGroups">Je moet eerst een membergroup maken voordat je kunt werken met role-based authentication.</key>
     <key alias="paErrorPage">Error Pagina</key>
     <key alias="paErrorPageHelp">Gebruikt om te tonen als een gebruiker is ingelogd, maar geen rechten heeft om de pagina te bekijken</key>
     <key alias="paHowWould">Hoe wil je de pagina beveiligen?</key>

src/Umbraco.Web.UI/umbraco/config/lang/pt.xml

@@ -576,7 +576,7 @@ Você pode remover com segurança do seu sistema clicando em "desinstalar pacote
   <area alias="publicAccess">
     <key alias="paAdvanced">Proteção baseada em função</key>
     <key alias="paAdvancedHelp"><![CDATA[Se você deseja controlar o acesso à página usando autenticação baseada em funções, <br /> usando grupos de membros do Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Você precisa criar um grupo de membros antes que possa usar <br /> autenticação baseada em função.]]></key>
+    <key alias="paAdvancedNoGroups">Você precisa criar um grupo de membros antes que possa usar autenticação baseada em função.</key>
     <key alias="paErrorPage">Página de Erro</key>
     <key alias="paErrorPageHelp">Usado quando as pessoas estão logadas, mas não para ter acesso</key>
     <key alias="paHowWould">Escolha como restringir o acesso à esta página</key>

src/Umbraco.Web.UI/umbraco/config/lang/ru.xml

@@ -284,6 +284,13 @@
     <key alias="noMediaTypes" version="7.0"><![CDATA[Нет ни одного разрешенного типа медиа-материалов для создания. Необходимо разрешить нужные Вам типы в секции "Установки" в дереве <strong>"Типы медиа-материалов"</strong>.]]></key>
     <key alias="updateData">Выберите тип и заголовок</key>
     <key alias="documentTypeWithoutTemplate">Тип документа без сопоставленного шаблона</key>
+    <key alias="newJavascriptFile">Новый файл javascript</key>
+    <key alias="newEmptyPartialView">Новое пустое частичное представление</key>
+    <key alias="newPartialViewMacro">Новый макрос-представление</key>
+    <key alias="newPartialViewFromSnippet">Новое частичное представление по образцу</key>
+    <key alias="newEmptyPartialViewMacro">Новый пустой макрос-представление</key>
+    <key alias="newPartialViewMacroFromSnippet">Новый макрос-представление по образцу</key>
+    <key alias="newPartialViewMacroNoMacro">Новый макрос-представление (без регистрации макроса)</key>
   </area>
   <area alias="dashboard">
     <key alias="browser">Обзор сайта</key>
@@ -409,6 +416,9 @@
     <key alias="rteShowLabel">Показать метку</key>
     <key alias="rteWidthAndHeight">Ширина и высота</key>
   </area>
+  <area alias="emptyStates">
+    <key alias="emptyDictionaryTree">Нет доступных элементов словаря</key>
+  </area>
   <area alias="errorHandling">
     <key alias="errorButDataWasSaved">Ваши данные сохранены, но для того, чтобы опубликовать этот документ, Вы должны сначала исправить следующие ошибки:</key>
     <key alias="errorChangingProviderPassword">Текущий провайдер ролей пользователей не поддерживает изменение пароля (необходимо свойству EnablePasswordRetrieval в файле web.config присвоить значение true)</key>
@@ -1012,6 +1022,7 @@
     <key alias="password">Укажите пароль</key>
     <key alias="search">Что искать...</key>
     <key alias="username">Укажите имя пользователя</key>
+    <key alias="usernameHint">Имя пользователя (часто это Ваш email-адрес)</key>
   </area>
   <area alias="prompt">
     <key alias="stay">Остаться</key>
@@ -1022,7 +1033,7 @@
   <area alias="publicAccess">
     <key alias="paAdvanced">Расширенный: Защита на основе ролей (групп)</key>
     <key alias="paAdvancedHelp"><![CDATA[Применяйте, если желаете контролировать доступ к документу на основе ролевой модели безопасности,<br /> с использованием групп участников Umbraco.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Вам необходимо создать хотя бы одну группу участников<br /> для применения ролевой модели безопасности.]]></key>
+    <key alias="paAdvancedNoGroups">Вам необходимо создать хотя бы одну группу участников для применения ролевой модели безопасности.</key>
     <key alias="paErrorPage">Страница сообщения об ошибке</key>
     <key alias="paErrorPageHelp">Используется в случае, когда пользователь авторизован в системе, но не имеет доступа к документу.</key>
     <key alias="paHowWould">Выберите способ ограничения доступа к документу</key>
@@ -1158,6 +1169,16 @@
 
     <key alias="toggleListView">В формате списка</key>
     <key alias="toggleAllowAsRoot">Разрешить в качестве корневого</key>
+
+    <key alias="commentLine">Закомментировать/раскомментировать строки</key>
+    <key alias="removeLine">Удалить строку</key>
+    <key alias="copyLineUp">Копировать строки вверх</key>
+    <key alias="copyLineDown">Копировать строки вниз</key>
+    <key alias="moveLineUp">Переместить строки вверх</key>
+    <key alias="moveLineDown">Переместить строки вниз</key>
+    
+    <key alias="generalHeader">Общее</key>
+    <key alias="editorHeader">Редактор</key>
   </area>
   <area alias="sort">
     <key alias="sortOrder">Порядок сортировки</key>
@@ -1243,14 +1264,106 @@
     <key alias="styles">Стили</key>
   </area>
   <area alias="template">
-    <key alias="edittemplate">Править шаблон</key>
+    <key alias="edittemplate">Изменить шаблон</key>
+
+    <key alias="insertSections">Секции</key>
     <key alias="insertContentArea">Вставить контент-область</key>
     <key alias="insertContentAreaPlaceHolder">Вставить контейнер (placeholder)</key>
-    <key alias="insertDictionaryItem">Вставить статью словаря</key>
-    <key alias="insertMacro">Вставить макрос</key>
-    <key alias="insertPageField">Вставить поле документа</key>
+
+    <key alias="insert">Вставить</key>
+    <key alias="insertDesc">Выберите, что хотите вставить в шаблон</key>
+    
+    <key alias="insertDictionaryItem">Статью словаря</key>
+    <key alias="insertDictionaryItemDesc">Статья словаря - это контейнер для части текста, переводимой на разные языки, это позволяет упростить создание многоязычных сайтов.</key>
+    
+    <key alias="insertMacro">Макрос</key>
+    <key alias="insertMacroDesc">
+      Макросы - это настраиваемые компоненты, которые хорошо подходят для
+      реализации переиспользуемых блоков, (особенно, если необходимо менять их внешний вид и/или поведение при помощи параметров)
+      таких как галереи, формы, списки и т.п.
+    </key>
+
+    <key alias="insertPageField">Значение поля</key>
+    <key alias="insertPageFieldDesc">Отображает значение указанного поля данных текущей страницы,
+      с возможностью указать альтернативные поля и/или подстановку константы.
+    </key>
+    
+    <key alias="insertPartialView">Частичное представление</key>
+    <key alias="insertPartialViewDesc">
+      Частичное представление - это шаблон в отдельном файле, который может быть вызван для отображения внутри
+      другого шаблона, хорошо подходит для реализации переиспользуемых фрагментов разметки или для разбиения сложных шаблонов на составные части.
+    </key>
+    
     <key alias="mastertemplate">Мастер-шаблон</key>
-    <key alias="quickGuide">Краткая справка по тэгам шаблонов Umbraco</key>
+    <key alias="noMastertemplate">Без мастер-шаблона</key>
+    <key alias="noMaster">Не выбран</key>
+
+    <key alias="renderBody">Вставить дочерний шаблон</key>
+    <key alias="renderBodyDesc">
+      <![CDATA[
+     Отображает содержимое дочернего шаблона, при помощи вставки конструкции
+     <code>@RenderBody()</code> в выбранном месте.
+      ]]>
+    </key>   
+    
+    <key alias="defineSection">Определить именованную секцию</key>
+    <key alias="defineSectionDesc">
+      <![CDATA[
+         Определяет специальную область шаблона как именованную секцию путем оборачивания ее в конструкцию
+          <code>@section { ... }</code>. Такая секци может быть отображена в нужном месте родительского шаблона
+          при помощи конструкции <code>@RenderSection</code>.
+      ]]>
+    </key>
+
+    <key alias="renderSection">Вставить именованную секцию</key>
+    <key alias="renderSectionDesc">
+      <![CDATA[
+      Отображает содержимое именованной области дочернего шаблона, при помощи вставки конструкции <code>@RenderSection(name)</code>.
+      Таким образом из дочернего шаблона отображается содержимое внутри конструкции <code>@section [name]{ ... }</code>.
+      ]]>
+    </key>
+
+    <key alias="sectionName">Название секции</key>
+    <key alias="sectionMandatory">Секция обязательна</key>
+    <key alias="sectionMandatoryDesc">
+      Если секция помечена как обязательная, то дочерний шаблон должен обязательно содержать ее определение <code>@section</code>, в противном случае генерируется ошибка.
+    </key>   
+    
+    <key alias="queryBuilder">Генератор запросов</key>
+    <key alias="itemsReturned">элементов в результате, за</key>
+
+    <key alias="iWant">Мне нужны</key>   
+    <key alias="allContent">все документы</key>
+    <key alias="contentOfType">документы типа &quot;%0%&quot;</key>
+    <key alias="from">из</key>
+    <key alias="websiteRoot">всего сайта</key>
+    <key alias="where">где</key>
+    <key alias="and">и</key>
+    
+    <key alias="is">равна</key>
+    <key alias="isNot">не равна</key>
+    <key alias="before">до</key>
+    <key alias="beforeIncDate">до (включая выбранную дату)</key>
+    <key alias="after">после</key>
+    <key alias="afterIncDate">после (включая выбранную дату)</key>
+    <key alias="equals">равно</key>
+    <key alias="doesNotEqual">не равно</key>
+    <key alias="contains">содержит</key>
+    <key alias="doesNotContain">не содержит</key>
+    <key alias="greaterThan">больше, чем</key>
+    <key alias="greaterThanEqual">больше или равно</key>
+    <key alias="lessThan">меньше, чем</key>
+    <key alias="lessThanEqual">меньше или равно</key>
+
+    <key alias="id">Id</key>
+    <key alias="name">Название</key>
+    <key alias="createdDate">Создан</key>
+    <key alias="lastUpdatedDate">Обновлен</key>
+
+    <key alias="orderBy">сортировать</key>
+    <key alias="ascending">по возрастанию</key>
+    <key alias="descending">по убыванию</key>    
+    
     <key alias="template">Шаблон</key>
   </area>
   <area alias="templateEditor">

src/Umbraco.Web.UI/umbraco/config/lang/sv.xml

@@ -594,11 +594,12 @@
     <key alias="search">Skriv för att söka...</key>
     <key alias="username">Fyll i ditt lösenord</key>
     <key alias="enterTags">Skriv för att lägga till taggar (och tryck enter efter varje tagg)...</key>
+    <key alias="usernamehint">Ditt användarnamn är vanligtvis din e-postadress</key>
   </area>
   <area alias="publicAccess">
     <key alias="paAdvanced">Rollbaserat lösenordsskydd</key>
     <key alias="paAdvancedHelp"><![CDATA[Välj detta alternativ om du vill skydda sidan med hjälp av rollbaserat lösenordsskydd.<br /> Då används Umbracos medlemsgrupper.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[Du måste skapa en medlemsgrupp innan du kan använda <br />rollbaserat lösenordsskydd.]]></key>
+    <key alias="paAdvancedNoGroups">Du måste skapa en medlemsgrupp innan du kan använda rollbaserat lösenordsskydd.</key>
     <key alias="paErrorPage">Sida med felmeddelande</key>
     <key alias="paErrorPageHelp">Används när en användare är inloggad, men saknar rättigheter att se sidan</key>
     <key alias="paHowWould">Välj hur du vill lösenordsskydda sidan</key>

src/Umbraco.Web.UI/umbraco/config/lang/tr.xml

@@ -734,7 +734,7 @@ To manage your website, simply open the Umbraco back office and start adding con
   <area alias="publicAccess">
     <key alias="paAdvanced">Role based protection</key>
     <key alias="paAdvancedHelp"><![CDATA[If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.]]></key>
-    <key alias="paAdvancedNoGroups"><![CDATA[You need to create a membergroup before you can use <br />role-based authentication.]]></key>
+    <key alias="paAdvancedNoGroups">You need to create a membergroup before you can use role-based authentication.</key>
     <key alias="paErrorPage">Error Page</key>
     <key alias="paErrorPageHelp">Used when people are logged on, but do not have access</key>
     <key alias="paHowWould">Choose how to restrict access to this page</key>

src/Umbraco.Web.UI/umbraco/controls/Images/ImageViewer.ascx.cs

@@ -2,6 +2,7 @@
 
 namespace Umbraco.Web.UI.Umbraco.Controls.Images
 {
+    [Obsolete("This is no longer used and will be removed in future versions")]
     public partial class ImageViewer : global::umbraco.controls.Images.ImageViewer
     {
     }

src/Umbraco.Web.UI/umbraco/controls/PasswordChanger.ascx.cs

@@ -4,6 +4,9 @@ using System.Configuration.Provider;
 using System.Linq;
 using System.Web;
 using System.Web.Security;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Security;
 
 namespace Umbraco.Web.UI.Umbraco.Controls
 {
@@ -20,9 +23,13 @@ namespace Umbraco.Web.UI.Umbraco.Controls
             umbPasswordChanger_passwordNewConfirm.Text = null;
             //reset the flag always
             IsChangingPasswordField.Value = "false";
-            this.DataBind();
-        } 
 
-       
+            var canReset = Provider.CanResetPassword(ApplicationContext.Current.Services.UserService);
+
+            ResetPlaceHolder.Visible = canReset;
+
+            this.DataBind();
+        }
+
     }
 }

src/Umbraco.Web.UI/umbraco/controls/passwordChanger.ascx

@@ -67,7 +67,7 @@
 
     <asp:HiddenField runat="server" ID="IsChangingPasswordField" Value="false" />
 
-    <asp:PlaceHolder runat="server" ID="ResetPlaceHolder" Visible="<%#Provider.EnablePasswordReset %>">
+    <asp:PlaceHolder runat="server" ID="ResetPlaceHolder">
         <div class="umb-el-wrap">
             <label class="control-label" for="<%=ResetPasswordCheckBox.ClientID %>"><%=umbraco.ui.GetText("user", "resetPassword")%></label>
             <div class="controls controls-row">

src/Umbraco.Web.UI/umbraco/developer/Packages/BrowseRepository.aspx

@@ -1,20 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Browse Repository" CodeBehind="BrowseRepository.aspx.cs" Inherits="umbraco.presentation.developer.packages.BrowseRepository" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-<cc1:UmbracoPanel id="Panel1" Text="Browse package repository" runat="server" Width="612px" Height="600px" hasMenu="false">
-    <cc1:Feedback ID="fb" runat="server" />
-    <asp:Literal runat="server" ID="iframeGen" />
-</cc1:UmbracoPanel>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="footer" runat="server">
-   <script type="text/javascript">
-     jQuery(document).ready(function() {
-       var frame = jQuery("#repoFrame");
-       var win = jQuery(window);
-       frame.height(win.height() - frame.offset().top - 40);
-       frame.width(win.width() - 35);
-     });
-   </script>
-</asp:Content>

src/Umbraco.Web.UI/umbraco/developer/Packages/LoadNitros.ascx

@@ -1,32 +0,0 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="LoadNitros.ascx.cs" Inherits="umbraco.presentation.developer.packages.LoadNitros" %>
-
-<asp:Panel id="loadNitros" runat="server">
-
-<div id="list1a">
-<span id="editorCategories">
-<a class="accordianOpener">
-Editors picks
-<small>Recommended by the umbraco core team</small>
-</a>
-<div style="display: block;" class="accordianContainer">
-<asp:PlaceHolder ID="ph_recommendedHolder" runat="server" />
-</div>
-</span>
-
-<span id="generatedCategories">
-<asp:Repeater ID="rep_nitros" runat="server" OnItemDataBound="onCategoryDataBound">
-<ItemTemplate>
-<a class="accordianOpener generated">
-<asp:Literal ID="lit_name" runat="server" />
-<small><asp:Literal ID="lit_desc" runat="server"/></small>
-</a>
-<div class="accordianContainer generated">
-  <asp:PlaceHolder ID="ph_nitroHolder" runat="server" />
-</div>
-</ItemTemplate>
-</asp:Repeater>
-</span>
-</div>
-
-<asp:Button runat="server" CssClass="loadNitrosButton" id="bt_install" OnClick="installNitros" OnClientClick="InstallPackages(this,'loadingBar'); return true;" Text="Install selected modules" />
-</asp:Panel>

src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx

@@ -1,86 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="True" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Install starter kit" CodeBehind="StarterKits.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Developer.Packages.StarterKits" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-
-<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
-
-<umb:JsInclude ID="JsInclude1" runat="server" FilePath="ui/jqueryui.js" PathNameAlias="UmbracoClient" />
-
-<script type="text/javascript">
-
-    var percentComplete = 0;
-
-    jQuery(document).ready(function() {
-        //bind to button click events
-        jQuery("a.selectStarterKit").click(function() {
-            jQuery(".progress-status").siblings(".install-dialog").hide();
-            jQuery(".progress-status").show();
-        });
-    });
-
-    function updateProgressBar(percent) {
-        percentComplete = percent;
-    }
-    function updateStatusMessage(message, error) {
-        if (message != null && message != undefined) {
-            jQuery(".progress-status").text(message + " (" + percentComplete + "%)");
-        }        
-    }
-
-</script>
-<style type="text/css">
-    
-    .progress-status {
-	    display: none;
-    }
-
-    .add-thanks
-    {
-        position:absolute;
-        left:-2500;
-        display:none !important;
-    }
-    
-    .zoom-list li {float: left; margin: 15px; display: block; width: 180px;}
-    
-    .btn-prev, .btn-next, .paging, .btn-preview, .faik-mask , .faik-mask-ie6
-    {
-        display:none;
-    }
-       
-    .image {float: left; margin: 15px; display: block; width: 140px;}
-    
-    .image .gal-drop{padding-top:10px;}
-    
-    ul{list-style-type: none;}
-</style>
-</asp:Content>
-
-<asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
-  <cc1:UmbracoPanel id="Panel1" Text="Starter kit" runat="server" Width="612px" Height="600px" hasMenu="false">
-    <cc1:Feedback ID="fb" runat="server" />
-    
-    <cc1:Pane id="StarterKitNotInstalled" Text="Install starter kit" runat="server">
-        <h3>Available starter kits</h3>
-        <p>You can choose from the following starter kits, each having specific functionality.</p>        
-        <div class="progress-status">Please wait...</div>
-        <div id="connectionError"></div>
-        <div id="serverError"></div>       
-        <div class="install-dialog">
-            <asp:PlaceHolder ID="ph_starterkits" runat="server"></asp:PlaceHolder>
-        </div>
-    </cc1:Pane>
-
-    <cc1:Pane id="installationCompleted" Text="Installation completed" runat="server" Visible="false">
-        <p>Installation completed succesfully</p>
-    </cc1:Pane>
-    
-    <cc1:Pane id="InstallationDirectoryNotAvailable" Text="Unable to install" runat="server" Visible="false">
-        <p>We can not install starterkits when the install directory or package repository is not present.</p>
-    </cc1:Pane>
-      
-
-  </cc1:UmbracoPanel>
-
-
-</asp:Content>

src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Web.UI.Install.Steps.Skinning;
-using Umbraco.Web.UI.Pages;
-using System.IO;
-using umbraco.cms.businesslogic.packager;
-
-namespace Umbraco.Web.UI.Umbraco.Developer.Packages
-{
-    
-
-    public partial class StarterKits : UmbracoEnsuredPage
-    {
-        private const string RepoGuid = "65194810-1f85-11dd-bd0b-0800200c9a66";
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            //check if a starter kit is already isntalled
-
-            var installed = InstalledPackage.GetAllInstalledPackages();
-
-            if (installed.Count == 0)
-            {
-                ShowStarterKits();
-                return;
-            }
-            
-            var repo = global::umbraco.cms.businesslogic.packager.repositories.Repository.getByGuid(RepoGuid);
-            if (repo.HasConnection())
-            {
-                try
-                {
-                    var kits = repo.Webservice.StarterKits();
-                    var kitIds = kits.Select(x => x.RepoGuid).ToArray();
-
-                    //if a starter kit is already installed show finish
-                    if (installed.Any(x => kitIds.Contains(Guid.Parse(x.Data.PackageGuid))))
-                    {
-                        StarterKitNotInstalled.Visible = false;
-                        installationCompleted.Visible = true;
-                    }
-                    else
-                    {
-                        ShowStarterKits();    
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.Error<StarterKits>("Cannot connect to package repository", ex);
-                    InstallationDirectoryNotAvailable.Visible = true;
-                    StarterKitNotInstalled.Visible = false;
-                }
-            }
-            else
-            {
-                InstallationDirectoryNotAvailable.Visible = true;
-                StarterKitNotInstalled.Visible = false;
-            }            
-        }
-
-        private void ShowStarterKits()
-        {
-            if (Directory.Exists(Server.MapPath(GlobalSettings.Path.EnsureEndsWith('/') + "install/Legacy")) == false)
-            {
-                InstallationDirectoryNotAvailable.Visible = true;
-                StarterKitNotInstalled.Visible = false;
-            
-                return;
-            }
-
-
-            var starterkitsctrl = (LoadStarterKits)LoadControl(GlobalSettings.Path.EnsureEndsWith('/') + "install/Legacy/loadStarterKits.ascx");
-            
-            ph_starterkits.Controls.Add(starterkitsctrl);
-
-            StarterKitNotInstalled.Visible = true;
-
-        }
-        
-    }
-}

src/Umbraco.Web.UI/umbraco/developer/Packages/StarterKits.aspx.designer.cs

@@ -1,78 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco.Developer.Packages {
-    
-    
-    public partial class StarterKits {
-        
-        /// <summary>
-        /// JsInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-        
-        /// <summary>
-        /// Panel1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoPanel Panel1;
-        
-        /// <summary>
-        /// fb control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Feedback fb;
-        
-        /// <summary>
-        /// StarterKitNotInstalled control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane StarterKitNotInstalled;
-        
-        /// <summary>
-        /// ph_starterkits control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.PlaceHolder ph_starterkits;
-        
-        /// <summary>
-        /// installationCompleted control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane installationCompleted;
-        
-        /// <summary>
-        /// InstallationDirectoryNotAvailable control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane InstallationDirectoryNotAvailable;
-    }
-}

src/Umbraco.Web.UI/umbraco/developer/Packages/SubmitPackage.aspx

@@ -1,113 +0,0 @@
-<%@ Page Language="C#" Title="Submit package" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="SubmitPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.SubmitPackage" %>
-<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-<asp:Content ContentPlaceHolderID="footer" runat="server">
-<script type="text/javascript">
-  var tb_email = document.getElementById('<%= tb_email.ClientID %>');
- 
-  if (tb_email.value != "") {
-    onRepoChange();
-  }
-</script>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-<script type="text/javascript">
-  function onRepoChange() {
-
-    var dropdown = document.getElementById('<%= dd_repositories.ClientID %>');
-    var myindex = dropdown.selectedIndex
-    var SelValue = dropdown.options[myindex].value
-    var repoLogin = document.getElementById('<%= pl_repoLogin.ClientID %>');
-
-    if (SelValue != "") {
-
-      var publicRepoHelp = document.getElementById('<%= publicRepoHelp.ClientID %>');
-      var privateRepoHelp = document.getElementById('<%= privateRepoHelp.ClientID %>');
-
-      publicRepoHelp.style.display = 'none';
-      privateRepoHelp.style.display = 'none';
-
-      if (SelValue == "65194810-1f85-11dd-bd0b-0800200c9a66") {
-        publicRepoHelp.style.display = 'block';
-      } else {
-        privateRepoHelp.style.display = 'block';
-      }
-
-      repoLogin.style.display = 'block';
-
-    } else {
-      repoLogin.style.display = 'none';
-    }
-  }
-  </script>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-<cc2:UmbracoPanel ID="Panel1" Text="Submit package to repository" runat="server" Width="496px" Height="584px">
-    <br />
-    <cc2:Feedback ID="fb_feedback" runat="server" />
-    <asp:PlaceHolder ID="feedbackControls" runat="server" Visible="false">
-      <br />
-      <p>
-      <button onclick="window.location.href = 'editpackage.aspx?id=<%= Request.QueryString["id"] %>'; return false;">Ok</button>
-      </p>
-    </asp:PlaceHolder>
-    
-    <cc2:Pane ID="Pane2" runat="server" Text="Repository">
-      
-      <asp:Panel ID="pl_repoChoose" runat="server">
-        <cc2:PropertyPanel runat="server">
-            <p>Choose the repository you want to submit the package to</p>
-        </cc2:PropertyPanel>
-        <cc2:PropertyPanel Text="Repository" runat="server">
-            <asp:DropDownList ID="dd_repositories" runat="server" />
-        </cc2:PropertyPanel>
-      </asp:Panel>
-      
-      <asp:Panel id="pl_repoLogin" style="display: none;" runat="server">
-      <cc2:PropertyPanel ID="PropertyPanel1" runat="server">
-      
-      <h3 style="margin-left: 0px; padding-top: 15px;">Please enter your credentials to authenticate your user.</h3>
-      <p runat="server" id="publicRepoHelp" style="display: none">If you do not have a user on the umbraco package repository, you can create one <a href="http://packages.umbraco.org/create-user" target="_blank">here</a>.</p>
-      <p runat="server" id="privateRepoHelp" style="display: none">If you do not have a user on this private repository, contact your repository administrator to gain access</p>
-      </cc2:PropertyPanel>
-      
-      <cc2:PropertyPanel ID="PropertyPanel2" runat="server" Text="Email">
-          <asp:TextBox ID="tb_email" runat="server" /> <asp:RequiredFieldValidator ID="RequiredFieldValidator1" ControlToValidate="tb_email" runat="server" ErrorMessage="*" />
-      </cc2:PropertyPanel>
-      
-      <cc2:PropertyPanel ID="PropertyPanel3" runat="server" Text="Password">
-         <asp:TextBox TextMode="Password" ID="tb_password" runat="server" /> <asp:RequiredFieldValidator ControlToValidate="tb_password" runat="server" ErrorMessage="*" />
-      </cc2:PropertyPanel>
-      </asp:Panel>
-      
-    </cc2:Pane>
-    
-    <cc2:Pane ID="Pane1" runat="server" Text="Documentation (.pdf only)">
-       <cc2:PropertyPanel ID="PropertyPanel4" runat="server">
-       <p>Upload additional documentation for your package to help new users getting started with your package</p>
-       </cc2:PropertyPanel>
-       
-       <cc2:PropertyPanel ID="PropertyPanel5" runat="server" Text="Documentation file">
-        <asp:FileUpload ID="fu_doc" runat="server" />
-        <asp:RegularExpressionValidator ID="doc_regex" runat="server" ControlToValidate="fu_doc" ValidationExpression="(.*?)\.(pdf|PDF)$" ErrorMessage="Only .pdf files are accepted" />
-       </cc2:PropertyPanel>
-    </cc2:Pane> 
-    
-    <asp:PlaceHolder runat="server" ID="submitControls">
-    <br />
-    
-    <div class="notice">
-        <p>By clicking "submit package" below you understand that your package will be submitted to a package repository and will in some cases be publicly available to download.</p>
-        <p><strong>Please notice: </strong> only packages with complete read-me, author information and install information gets considered for inclusion.</p>
-        <p>The package administrators group reservers the right to decline packages based on lack of documentation, poorly written readme and missing author information</p>
-    </div>
-    
-    <p>
-      <asp:Button ID="bt_submit" runat="server" Text="Submit package" OnClick="submitPackage" /> &nbsp;<em><%= umbraco.ui.Text("or") %></em> &nbsp;<a href="editpackage.aspx?id=<%= Request.QueryString["id"] %>"><%= umbraco.ui.Text("cancel") %></a>
-    </p>
-    </asp:PlaceHolder>
-    
-    </cc2:UmbracoPanel>
-</asp:Content>

src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx

@@ -39,7 +39,6 @@
             <asp:TextBox ID="iconUrl" runat="server" Width="230px" CssClass="guiInputText"></asp:TextBox>            
         </cc2:PropertyPanel>
         <cc2:PropertyPanel runat="server" ID="pp_file" Text="Package file (.zip):">
-            <asp:Button ID="bt_submitButton" runat="server" Text="Submit to repository" Visible="false" />
             <asp:Literal ID="packageUmbFile" runat="server" />
         </cc2:PropertyPanel>
          

src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx

@@ -1,184 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="installedPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.installedPackage" %>
-<%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<asp:Content ContentPlaceHolderID="head" runat="server">
-    <script type="text/javascript">
-        function toggleDiv(id, gotoDiv) {
-            var div = document.getElementById(id);
-
-            if (div.style.display == "none")
-                div.style.display = "block";
-
-            else
-                div.style.display = "none";
-        }
-
-        function openDemo(link, id) {
-            UmbClientMgr.openModalWindow("http://packages.umbraco.org/viewPackageData.aspx?id=" + id, link.innerHTML, true, 750, 550)
-        }
-
-    </script>
-
-    <style type="text/css">
-        .propertyItemheader {
-            width: 250px;
-        }
-    </style>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-
-
-    <cc2:Tabview ID="Panel1" Text="Installed package" runat="server" Width="496px" Height="584px">
-
-
-       
-
-
-            <cc2:Pane ID="pane_meta" runat="server" Text="Package meta data">
-
-                <cc2:PropertyPanel ID="pp_name" runat="server">
-                    <asp:Literal ID="lt_packagename" runat="server" />
-                </cc2:PropertyPanel>
-                <cc2:PropertyPanel ID="pp_version" runat="server">
-                    <asp:Literal ID="lt_packageVersion" runat="server" />
-                </cc2:PropertyPanel>
-                <cc2:PropertyPanel ID="pp_author" runat="server">
-                    <asp:Literal ID="lt_packageAuthor" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel ID="pp_documentation" Visible="false" runat="server">
-                    <asp:HyperLink id="hl_docLink" Target="_blank" runat="server" />
-                    <asp:LinkButton id="lb_demoLink" OnClientClick="" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel ID="pp_repository" Visible="false" runat="server">
-                    <asp:HyperLink id="hl_packageRepo" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel ID="pp_readme" runat="server">
-                    <div style="position: relative; background: #fff; padding: 3px; border: 1px solid #ccc; width: 400px; white-space: normal !Important; overflow: auto;">
-                        <asp:Literal ID="lt_readme" runat="server" /></div>
-                </cc2:PropertyPanel>
-
-
-            </cc2:Pane>
-
-            <cc2:Pane ID="pane_versions" runat="server" Text="Package version history" Visible="false">
-                <cc2:PropertyPanel ID="pp_versions" runat="server">
-                    <asp:Repeater ID="rptr_versions" runat="server">
-                        <headertemplate><ul></headertemplate>
-                        <itemtemplate><li><a href="#"><%# ((umbraco.cms.businesslogic.packager.InstalledPackage)Container.DataItem).Data.Name %></a></li></itemtemplate>
-                        <footertemplate></ul></footertemplate>
-                    </asp:Repeater>
-                </cc2:PropertyPanel>
-            </cc2:Pane>
-            
-        <cc2:Pane ID="pane_upgrade" runat="server" Text="Upgrade package" Visible="false">
-    
-            <cc2:PropertyPanel runat="server">
-              <p>
-                  <%= umbraco.ui.Text("packager", "packageUpgradeText") %>
-              </p>
-            </cc2:PropertyPanel>
-    
-            <cc2:PropertyPanel ID="pp_upgradeInstruction" Text="Upgrade instructions" runat="server">
-                  <p>
-                    <asp:Literal ID="lt_upgradeReadme" runat="server" />
-                  </p>
-            
-                  <p>
-                    <asp:Button ID="bt_gotoUpgrade" Text="Download update from the repository" runat="server" UseSubmitBehavior="false" />
-                  </p>
-            </cc2:PropertyPanel>
-        </cc2:Pane>
-
-            <cc2:Pane ID="pane_noItems" Visible="false" runat="server" Text="Uninstaller doesn't contain any items">
-                <div class="guiDialogNormal" style="margin: 10px">
-
-                    <%= umbraco.ui.Text("packager", "packageNoItemsText") %>
-
-                    <p>
-                        <asp:Button ID="bt_deletePackage" OnClick="delPack" runat="server" Text="Remove uninstaller" />
-                    </p>
-                </div>
-
-            </cc2:Pane>
-
-            
-            <cc2:Pane ID="pane_uninstall" runat="server" Text="Uninstall items installed by this package">
-                <p>
-                    <%= umbraco.ui.Text("packager", "packageUninstallText") %>
-                </p>
-
-                <cc2:PropertyPanel runat="server" Text="Document Types" ID="pp_docTypes">
-                    <asp:CheckBoxList ID="documentTypes" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel runat="server" Text="Templates" ID="pp_templates">
-                    <asp:CheckBoxList ID="templates" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel runat="server" Text="Stylesheets" ID="pp_css">
-                    <asp:CheckBoxList ID="stylesheets" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel runat="server" Text="Macros" ID="pp_macros">
-                    <asp:CheckBoxList ID="macros" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel ID="pp_files" runat="server" Text="Files">
-                    <asp:CheckBoxList ID="files" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel ID="pp_di" runat="server" Text="Dictionary Items">
-                    <asp:CheckBoxList ID="dictionaryItems" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel ID="pp_dt" runat="server" Text="Data types">
-                    <asp:CheckBoxList ID="dataTypes" runat="server" />
-                </cc2:PropertyPanel>
-
-                <cc2:PropertyPanel ID="pp_confirm" runat="server" Text="&nbsp;">
-                        <asp:Button ID="bt_confirmUninstall" OnClick="confirmUnInstall" OnClientClick="$('#loadingbar').show()" Text="Confirm uninstall" CssClass="btn btn-primary" runat="server" />
-                        <div id="loadingbar" style="display: none">
-                            <div class="umb-loader-wrapper">
-                                <cc2:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
-                            </div>
-                        </div>
-                </cc2:PropertyPanel>
-            </cc2:Pane>
-
-           <cc2:Pane id="pane_uninstalled" runat="server" Visible="false">
-
-                <div class="alert alert-block">
-                    Package uninstall in progress, please wait while the browser is reloaded...
-                </div>
-
-                <script type="text/javascript">
-                    
-                    //This is all a bit zany with double encoding because we have a URL in a hash (#) url part
-                    // but it works and maintains query strings
-
-                    var umbPath = "<%=umbraco.GlobalSettings.Path%>";
-                    setTimeout(function () {
-                        var mainWindow = UmbClientMgr.mainWindow();
-
-                        //kill the tree and template cache
-                        if (mainWindow.UmbClientMgr) {
-                            mainWindow.UmbClientMgr._packageInstalled();
-                        }
-
-                        var baseUrl = mainWindow.location.href.substr(0, mainWindow.location.href.indexOf("#/developer/framed/"));
-                        var framedUrl = baseUrl + "#/developer/framed/";
-                        var refreshUrl = framedUrl + encodeURIComponent(encodeURIComponent(umbPath + "/developer/packages/installer.aspx?installing=uninstalled"));
-
-                        var redirectUrl = umbPath + "/ClientRedirect.aspx?redirectUrl=" + refreshUrl;
-
-                        mainWindow.location.href = redirectUrl;
-                    }, 2000);
-                </script>
-
-
-             </cc2:Pane>
-    </cc2:Tabview>
-</asp:Content>

src/Umbraco.Web.UI/umbraco/developer/Packages/proxy.htm

@@ -1,67 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<head>
-    <title>Repo proxy</title>
-</head>
-<body>
-
-    <script type="text/javascript">
-        
-        //This is a stupid way of parsing a uri
-        //https://gist.github.com/jlong/2428561
-
-        try {
-		
-            var parser = document.createElement('a');
-            parser.href = window.location.search.substring(1);
-
-            // This next line may seem redundant but is required to get around a bug in IE 
-            // that doesn't set the parser.hostname or parser.protocol correctly for relative URLs.
-            // see https://gist.github.com/jlong/2428561#gistcomment-1461205
-            parser.href = parser.href;
-
-            // => "http:"
-            if (parser.protocol && (parser.protocol.toLowerCase() != "http:" && parser.protocol.toLowerCase() != "https:")) {
-                throw "invalid protocol";
-            };
-
-            // => "example.com"
-            if (!parser.hostname || parser.hostname == "") {
-                throw "invalid hostname";
-            }
-            
-            //parser.port;     // => "3000"
-
-            // => "/pathname/"
-            if (!parser.pathname || ((parser.pathname.length - parser.pathname.toLowerCase().indexOf("/developer/packages/installer.aspx")) != "/developer/packages/installer.aspx".length))
-            {
-                throw "invalid pathname";
-            }
-            
-            // => "?search=test"
-            if (!parser.search || parser.search.toLowerCase().indexOf("?repoguid") != 0) {
-                throw "invalid search";
-            }
-            
-            // => "#hash"
-            if (parser.hash && parser.hash != "") {
-                throw "invalid hash";
-            }   
-
-            //parser.host;     // => "example.com:3000"
-
-            if (!top.right) {
-                throw "invalid document";
-            }
-
-            top.right.document.location = window.location.search.substring(1);
-
-        } catch (e) {
-            alert(e);
-        }
-
-        
-    </script>
-
-</body>
-</html>

src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx

@@ -9,7 +9,7 @@
 </asp:Content>
 
 <asp:Content ContentPlaceHolderID="head" runat="server" ID="cp2">
-    
+
     <umb:JsInclude ID="JsInclude2" runat="server" FilePath="Editors/EditXslt.js" PathNameAlias="UmbracoClient" />
     <umb:CssInclude ID="CssInclude1" runat="server" FilePath="Editors/EditXslt.css" PathNameAlias="UmbracoClient" />
 
@@ -21,8 +21,7 @@
                     nameTxtBox: $('#<%= xsltFileName.ClientID %>'),
                     originalFileName: '<%= xsltFileName.Text %>',
                     saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
-                    editorSourceElement: $('#<%= editorSource.ClientID %>'),
-                    skipTestingCheckBox: $("#<%= SkipTesting.ClientID %>"),
+                    editorSourceElement: $('#<%= editorSource.ClientID %>')
                 });
                 editor.init();
 
@@ -32,7 +31,7 @@
         })(jQuery);
 
         //TODO: Move these to EditXslt.js one day
-        var xsltSnippet = "";        
+        var xsltSnippet = "";
         function xsltVisualize() {
 
             xsltSnippet = UmbEditor.IsSimpleEditor
@@ -46,7 +45,7 @@
             }
 
             UmbClientMgr.openModalWindow('<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650);
-        } 
+        }
     </script>
     <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Application/jQuery/jquery-fieldselection.js"
         PathNameAlias="UmbracoClient" />
@@ -56,14 +55,11 @@
             <cc1:Pane runat="server" ID="pane1">
                 <cc1:CodeArea ID="editorSource" CodeBase="XML" runat="server" AutoResize="false"  />
             </cc1:Pane>
-            
+
             <cc1:Pane runat="server" ID="pane2">
                  <cc1:PropertyPanel ID="pp_filename" runat="server" Text="Filename">
                     <asp:TextBox ID="xsltFileName" runat="server" CssClass="guiInputText"></asp:TextBox>
                 </cc1:PropertyPanel>
-                <cc1:PropertyPanel ID="pp_testing" runat="server" Text="Skip testing (ignore errors)">
-                    <asp:CheckBox ID="SkipTesting" runat="server"></asp:CheckBox>
-                </cc1:PropertyPanel>
             </cc1:Pane>
     </cc1:TabView>
 </asp:Content>

src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx

@@ -103,11 +103,10 @@
                 <label for="body_rb_advanced">
                     <h4 class="pa-access-header"><%= umbraco.ui.Text("publicAccess", "paAdvanced", base.getUser())%></h4>
                     <p class="pa-access-description"><%= umbraco.ui.Text("publicAccess", "paAdvancedHelp", base.getUser())%></p>
+                    <br />
 
-                    <asp:Panel runat="server" Visible="false" ID="p_noGroupsFound" CssClass="error">
-                        <p>
-                            <%= umbraco.ui.Text("publicAccess", "paAdvancedNoGroups", UmbracoUser)%>
-                        </p>
+                    <asp:Panel runat="server" Visible="false" ID="p_noGroupsFound" CssClass="alert alert-danger">
+                        <span><%= umbraco.ui.Text("publicAccess", "paAdvancedNoGroups", UmbracoUser)%></span>
                     </asp:Panel>
                 </label>
             </div>
@@ -137,7 +136,7 @@
             </cc1:PropertyPanel>
         </div>
 
-        <asp:CustomValidator CssClass="pa-validation-message error" runat="server" ID="SimpleLoginNameValidator" Display="Dynamic" EnableViewState="False">
+        <asp:CustomValidator CssClass="alert alert-danger" runat="server" ID="SimpleLoginNameValidator" Display="Dynamic" EnableViewState="False">
            <p class="alert">Member name already exists, click <asp:LinkButton runat="server" OnClick="ChangeOnClick" CssClass="btn btn-mini btn-warning">Change</asp:LinkButton> to use a different name or Update to continue</p>
         </asp:CustomValidator>
     </cc1:Pane>

src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx

@@ -1,88 +0,0 @@
-<%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="True"
-    CodeBehind="EditView.aspx.cs" Inherits="Umbraco.Web.UI.Umbraco.Settings.Views.EditView"
-    ValidateRequest="False" %>
-
-<%@ OutputCache Location="None" %>
-
-<%@ Import Namespace="Umbraco.Core" %>
-<%@ Import Namespace="Umbraco.Core.IO" %>
-<%@ Import Namespace="Umbraco.Web" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-
-<asp:Content ID="DocTypeContent" ContentPlaceHolderID="DocType" runat="server">
-    <!DOCTYPE html>
-</asp:Content>
-
-<asp:Content ContentPlaceHolderID="head" runat="server">
-    
-    <umb:JsInclude ID="JsInclude1" runat="server" FilePath="Editors/EditView.js" PathNameAlias="UmbracoClient" />
-
-    <script type="text/javascript">
-
-        //we need to have this as a global object since we reference this object with callbacks.
-        var editViewEditor;
-
-        (function ($) {
-            $(document).ready(function () {
-                //create and assign a new EditView object
-                editViewEditor = new Umbraco.Editors.EditView({
-                    treeSyncPath: "<%=TemplateTreeSyncPath%>",
-                    currentTreeType: "<%=CurrentTreeType%>",
-                    editorType: "<%= EditorType.ToString() %>",
-                    originalFileName: "<%=OriginalFileName %>",
-                    restServiceLocation: "<%= Url.GetSaveFileServicePath() %>",                    
-                    masterPageDropDown: $("#<%= MasterTemplate.ClientID %>"),
-                    nameTxtBox: $("#<%= NameTxt.ClientID %>"),
-                    aliasTxtBox: $("#<%= AliasTxt.ClientID %>"),
-                    saveButton: $("#<%= ((Control)SaveButton).ClientID %>"),
-                    templateId: '<%= Request.CleanForXss("templateID") %>',
-                    codeEditorElementId: '<%= editorSource.ClientID %>',
-                    modalUrl: "<%= IOHelper.ResolveUrl(SystemDirectories.Umbraco) %>/dialogs/editMacro.aspx"
-                });
-
-                //initialize it.
-                editViewEditor.init();
-                
-                //bind save shortcut
-                UmbClientMgr.appActions().bindSaveShortCut();
-            });            
-        })(jQuery);
-       
-    </script>
-
-</asp:Content>
-
-
-<asp:Content ContentPlaceHolderID="body" runat="server">
-    
-    <cc1:TabView ID="Panel1" runat="server" hasMenu="true">
-        
-         <cc1:Pane ID="Pane8" runat="server" >
-            <cc1:PropertyPanel ID="pp_source" runat="server">
-                <cc1:CodeArea ID="editorSource" runat="server" CodeBase="Razor" ClientSaveMethod="doSubmit" AutoResize="false" />
-            </cc1:PropertyPanel>
-         </cc1:Pane>
-            
-        <cc1:Pane ID="Pane7" runat="server" >
-            
-            <cc1:PropertyPanel ID="pp_name" runat="server">
-                <asp:Literal runat="server" ID="PathPrefix"></asp:Literal>
-                <asp:TextBox ID="NameTxt" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-            
-            <cc1:PropertyPanel ID="pp_alias" runat="server">
-                <asp:TextBox ID="AliasTxt" runat="server"></asp:TextBox>
-            </cc1:PropertyPanel>
-
-            <cc1:PropertyPanel ID="pp_masterTemplate" runat="server">
-                <asp:DropDownList ID="MasterTemplate" runat="server" />
-            </cc1:PropertyPanel>
-
-            
-        </cc1:Pane>
-
-        
-    </cc1:TabView>
-
-</asp:Content>

src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs

@@ -1,280 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Web.Trees;
-using Umbraco.Web.UI.Controls;
-using umbraco;
-using umbraco.BasePages;
-using umbraco.cms.businesslogic.template;
-using umbraco.cms.helpers;
-using umbraco.cms.presentation.Trees;
-using Umbraco.Core;
-using umbraco.uicontrols;
-
-namespace Umbraco.Web.UI.Umbraco.Settings.Views
-{
-	public partial class EditView : global::umbraco.BasePages.UmbracoEnsuredPage
-	{
-		private Template _template;
-		public MenuButton SaveButton;
-
-		public EditView()
-		{
-			CurrentApp = global::umbraco.BusinessLogic.DefaultApps.settings.ToString();
-		}
-
-		/// <summary>
-		/// The type of MVC/Umbraco view the editor is editing
-		/// </summary>
-		public enum ViewEditorType
-		{
-			Template,
-			PartialView,
-            PartialViewMacro
-		}
-
-		/// <summary>
-		/// Returns the type of view being edited
-		/// </summary>
-		protected ViewEditorType EditorType
-		{
-		    get
-		    {
-		        if (_template != null) return ViewEditorType.Template;
-                if (Request.QueryString["treeType"].IsNullOrWhiteSpace() == false && Request.QueryString["treeType"].InvariantEquals("partialViewMacros")) return ViewEditorType.PartialViewMacro;
-		        return ViewEditorType.PartialView;
-		    }
-		}
-
-        protected string TemplateTreeSyncPath { get; private set; }
-	    
-        /// <summary>
-        /// This view is shared between different trees so we'll look for the query string
-        /// </summary>
-        protected string CurrentTreeType
-	    {
-	        get
-	        {
-	            if (Request.QueryString["treeType"].IsNullOrWhiteSpace())
-	            {
-	                return TreeDefinitionCollection.Instance.FindTree<PartialViewsTree>().Tree.Alias;
-	            }
-	            return Request.CleanForXss("treeType");
-	        }
-	    }
-
-		/// <summary>
-		/// Returns the original file name that the editor was loaded with
-		/// </summary>
-		/// <remarks>
-		/// this is used for editing a partial view
-		/// </remarks>
-		protected string OriginalFileName { get; private set; }
-
-		protected override void OnLoad(EventArgs e)
-		{
-			base.OnLoad(e);
-
-			if (!IsPostBack)
-			{
-
-				//configure screen for editing a template
-				if (_template != null)
-				{
-					MasterTemplate.Items.Add(new ListItem(ui.Text("none"), "0"));
-					var selectedTemplate = string.Empty;
-
-					foreach (var t in Template.GetAllAsList())
-					{
-						if (t.Id == _template.Id) continue;
-
-						var li = new ListItem(t.Text, t.Id.ToString(CultureInfo.InvariantCulture));
-						li.Attributes.Add("id", t.Alias.Replace(" ", "") + ".cshtml");
-						MasterTemplate.Items.Add(li);
-					}
-
-					try
-					{
-						if (_template.MasterTemplate > 0)
-							MasterTemplate.SelectedValue = _template.MasterTemplate.ToString(CultureInfo.InvariantCulture);
-					}
-					catch (Exception ex)
-					{
-                        LogHelper.Error<EditView>("An error occurred setting a master template id", ex);
-					}
-
-					MasterTemplate.SelectedValue = selectedTemplate;
-					NameTxt.Text = _template.GetRawText();
-					AliasTxt.Text = _template.Alias;
-					editorSource.Text = _template.Design;
-				    PathPrefix.Visible = false;
-				}
-				else
-				{
-					//configure editor for editing a file....
-
-					NameTxt.Text = OriginalFileName;
-				    var svce = ApplicationContext.Current.Services.FileService;
-                    var file = EditorType == ViewEditorType.PartialView
-				        ? svce.GetPartialView(OriginalFileName)
-                        : svce.GetPartialViewMacro(OriginalFileName);
-				    editorSource.Text = file.Content;
-
-                    const string prefixFormat = "<span style=\"display: inline-block; height: 20px; line-height: 20px; margin-bottom: 0px; padding: 4px 6px;\">{0}</span>";
-                    PathPrefix.Text = string.Format(prefixFormat, EditorType == ViewEditorType.PartialView
-				        ? "Partials/"
-				        : "MacroPartials/");
-				}							
-			}
-            
-            ClientTools
-                .SetActiveTreeType(CurrentTreeType)
-                .SyncTree(TemplateTreeSyncPath, false);
-		}
-
-
-		protected override void OnInit(EventArgs e)
-		{
-			base.OnInit(e);
-
-			//check if a templateId is assigned, meaning we are editing a template
-			if (!Request.QueryString["templateID"].IsNullOrWhiteSpace())
-			{
-				_template = new Template(int.Parse(Request.QueryString["templateID"]));
-                TemplateTreeSyncPath = "-1,init," + _template.Path.Replace("-1,", "");
-			}
-			else if (!Request.QueryString["file"].IsNullOrWhiteSpace())
-			{
-				//we are editing a view (i.e. partial view)
-				OriginalFileName = HttpUtility.UrlDecode(Request.QueryString["file"]);
-
-                //TemplateTreeSyncPath = "-1,init," + Path.GetFileName(OriginalFileName);
-
-                TemplateTreeSyncPath = DeepLink.GetTreePathFromFilePath(OriginalFileName.TrimStart("MacroPartials/").TrimStart("Partials/"));
-			}
-			else
-			{
-				throw new InvalidOperationException("Cannot render the editor without a supplied templateId or a file");
-			}
-			
-			Panel1.hasMenu = true;
-            var editor = Panel1.NewTabPage(ui.Text("template"));
-            editor.Controls.Add(Pane8);
-
-            var props = Panel1.NewTabPage(ui.Text("properties"));
-            props.Controls.Add(Pane7);
-
-
-            SaveButton = Panel1.Menu.NewButton();
-            SaveButton.Text = ui.Text("save");
-            SaveButton.ButtonType = MenuButtonType.Primary;
-            SaveButton.ID = "save";
-            SaveButton.CssClass = "client-side";
-
-			Panel1.Text = ui.Text("edittemplate");
-			pp_name.Text = ui.Text("name", base.getUser());
-			pp_alias.Text = ui.Text("alias", base.getUser());
-			pp_masterTemplate.Text = ui.Text("mastertemplate", base.getUser());
-
-			// Editing buttons
-            MenuIconI umbField = editorSource.Menu.NewIcon();
-			umbField.ImageURL = UmbracoPath + "/images/editor/insField.gif";
-			umbField.OnClickCommand =
-				ClientTools.Scripts.OpenModalWindow(
-					IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" +
-					editorSource.ClientID + "&tagName=UMBRACOGETDATA&mvcView=true", ui.Text("template", "insertPageField"), 640, 550);
-			umbField.AltText = ui.Text("template", "insertPageField");
-
-
-			// TODO: Update icon
-            MenuIconI umbDictionary = editorSource.Menu.NewIcon();
-			umbDictionary.ImageURL = GlobalSettings.Path + "/images/editor/dictionaryItem.gif";
-			umbDictionary.OnClickCommand =
-				ClientTools.Scripts.OpenModalWindow(
-					IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/umbracoField.aspx?objectId=" +
-                    editorSource.ClientID + "&tagName=UMBRACOGETDICTIONARY&mvcView=true", ui.Text("template", "insertDictionaryItem"),
-					640, 550);
-			umbDictionary.AltText = "Insert umbraco dictionary item";
-
-			var macroSplitButton = new InsertMacroSplitButton
-				{
-					ClientCallbackInsertMacroMarkup = "function(alias) {editViewEditor.insertMacroMarkup(alias);}",
-					ClientCallbackOpenMacroModel = "function(alias) {editViewEditor.openMacroModal(alias);}"
-				};
-            editorSource.Menu.InsertNewControl(macroSplitButton, 40);
-
-            MenuIconI umbTemplateQueryBuilder = editorSource.Menu.NewIcon();
-            umbTemplateQueryBuilder.ImageURL = UmbracoPath + "/images/editor/inshtml.gif";
-            umbTemplateQueryBuilder.OnClickCommand = "editViewEditor.openQueryModal()";
-            umbTemplateQueryBuilder.AltText = "Open query builder";
-
-			if (_template == null)
-			{
-				InitializeEditorForPartialView();
-			}
-			else
-			{
-				InitializeEditorForTemplate();	
-			}
-			
-		}
-
-		protected override void OnPreRender(EventArgs e)
-		{
-			base.OnPreRender(e);
-			ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/codeEditorSave.asmx"));
-			ScriptManager.GetCurrent(Page).Services.Add(new ServiceReference("../webservices/legacyAjaxCalls.asmx"));
-		}
-		
-		/// <summary>
-		/// Configure the editor for partial view editing
-		/// </summary>
-		private void InitializeEditorForPartialView()
-		{
-			pp_masterTemplate.Visible = false;
-			pp_alias.Visible = false;
-			pp_name.Text = "Filename";
-		}
-
-		/// <summary>
-		/// Configure the editor for editing a template
-		/// </summary>
-		private void InitializeEditorForTemplate()
-		{
-
-            //TODO: implement content placeholders, etc... just like we had in v5
-
-            editorSource.Menu.InsertSplitter();
-
-            MenuIconI umbRenderBody = editorSource.Menu.NewIcon();
-            umbRenderBody.ImageURL = UmbracoPath + "/images/editor/renderbody.gif";
-            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
-            umbRenderBody.AltText = "Insert @RenderBody()";
-
-            umbRenderBody.OnClickCommand = "editViewEditor.insertRenderBody()";
-
-            MenuIconI umbSection = editorSource.Menu.NewIcon();
-            umbSection.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
-            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
-            umbSection.AltText = "Insert Section";
-
-            umbSection.OnClickCommand = "editViewEditor.openSnippetModal('section')";
-
-            MenuIconI umbRenderSection = editorSource.Menu.NewIcon();
-            umbRenderSection.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
-            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
-            umbRenderSection.AltText = "Insert @RenderSection";
-
-            umbRenderSection.OnClickCommand = "editViewEditor.openSnippetModal('rendersection')";
-
-        }
-
-    }
-}

src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.designer.cs

@@ -1,132 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Umbraco.Web.UI.Umbraco.Settings.Views {
-    
-    
-    public partial class EditView {
-        
-        /// <summary>
-        /// JsInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.JsInclude JsInclude1;
-        
-        /// <summary>
-        /// Panel1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.TabView Panel1;
-        
-        /// <summary>
-        /// Pane8 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane Pane8;
-        
-        /// <summary>
-        /// pp_source control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_source;
-        
-        /// <summary>
-        /// editorSource control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.CodeArea editorSource;
-        
-        /// <summary>
-        /// Pane7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.Pane Pane7;
-        
-        /// <summary>
-        /// pp_name control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_name;
-        
-        /// <summary>
-        /// PathPrefix control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Literal PathPrefix;
-        
-        /// <summary>
-        /// NameTxt control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox NameTxt;
-        
-        /// <summary>
-        /// pp_alias control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_alias;
-        
-        /// <summary>
-        /// AliasTxt control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox AliasTxt;
-        
-        /// <summary>
-        /// pp_masterTemplate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.PropertyPanel pp_masterTemplate;
-        
-        /// <summary>
-        /// MasterTemplate control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.DropDownList MasterTemplate;
-    }
-}

src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx

@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoPage.Master" CodeBehind="PermissionEditor.aspx.cs" Inherits="umbraco.cms.presentation.user.PermissionEditor" %>
-
+<%@ Import Namespace="Umbraco.Web" %>
 <%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 <%@ Register Src="NodePermissions.ascx" TagName="NodePermissions" TagPrefix="user" %>
 <%@ Register TagPrefix="ui" Namespace="umbraco.uicontrols" Assembly="controls" %>

src/Umbraco.Web.UI/web.Template.Debug.config

@@ -17,6 +17,8 @@
 
 
   <configSections>
+    <section name="urlrewritingnet" xdt:Locator="Match(name)" xdt:Transform="Remove"  />
+    
     <section name="Examine" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
     <section name="ExamineLuceneIndexSets" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type)" />
 
@@ -35,6 +37,8 @@
 
   </configSections>
 
+  <urlrewritingnet xdt:Transform="Remove" />
+
   <BaseRestExtensions xdt:Transform="Remove" />
   <FileSystemProviders xdt:Transform="Remove" />
   <umbracoConfiguration xdt:Transform="Remove" />
@@ -101,11 +105,14 @@
       </assemblies>
     </compilation>
 
+    <httpModules>
+      <add name="UrlRewriteModule" xdt:Transform="Remove" xdt:Locator="Match(name)" />
+    </httpModules>
     <httpHandlers>
       <add path="GoogleSpellChecker.ashx" xdt:Transform="Remove" xdt:Locator="Match(path)" />
     </httpHandlers>
   </system.web>
-  
+
   <system.web>
     <compilation xdt:Transform="InsertIfMissing" />
     <compilation>
@@ -301,15 +308,19 @@
       <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
       <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
     </httpModules>
-	
+
   </system.web>
 
-  
+
   <system.web.extensions xdt:Transform="Remove" />
 
   <system.codedom xdt:Transform="Remove" />
 
   <system.webServer>
+    <modules runAllManagedModulesForAllRequests="true">      
+      <remove name="UrlRewriteModule" xdt:Transform="Remove" xdt:Locator="Match(name)" />
+      <add name="UrlRewriteModule" xdt:Transform="Remove" xdt:Locator="Match(name)" />      
+    </modules>
     <handlers>
       <remove name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)" />
       <add name="SpellChecker" xdt:Transform="Remove" xdt:Locator="Match(name)" />
@@ -375,14 +386,14 @@
 												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='HtmlAgilityPack']])" />
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-        <bindingRedirect oldVersion="1.4.5.0-1.4.6.0" newVersion="1.4.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
       </dependentAssembly>
 
       <dependentAssembly  xdt:Transform="Remove"
 												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
 
       <dependentAssembly xdt:Transform="Remove"
@@ -413,6 +424,13 @@
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
       </dependentAssembly>
 
+      <dependentAssembly xdt:Transform="Remove"
+												 xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='log4net']])" />
+      <dependentAssembly xdt:Transform="Insert">
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
+      </dependentAssembly>
+
     </assemblyBinding>
 
   </runtime>

src/Umbraco.Web.UI/web.Template.Release.config

@@ -13,17 +13,6 @@
 		<trace enabled="false" xdt:Transform="SetAttributes(enabled)" />
 		<customErrors mode="RemoteOnly" xdt:Transform="SetAttributes(mode)">
 		</customErrors>
-
-		<membership>
-			<providers>
-				<add xdt:Transform="SetAttributes(useLegacyEncoding,minRequiredPasswordLength)" xdt:Locator="Match(name)" name="UmbracoMembershipProvider"
-					 minRequiredPasswordLength="8"
-					 useLegacyEncoding="true" />
-				<add xdt:Transform="SetAttributes(useLegacyEncoding,minRequiredPasswordLength)" xdt:Locator="Match(name)" name="UsersMembershipProvider"
-					 minRequiredPasswordLength="8"
-					 useLegacyEncoding="true" />
-			</providers>
-		</membership>
 	</system.web>
 
 

src/Umbraco.Web.UI/web.Template.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<configSections>
-		<section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
 		<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
 		<section name="clientDependency" type="ClientDependency.Core.Config.ClientDependencySection, ClientDependency.Core" requirePermission="false" />
 		<section name="Examine" type="Examine.Config.ExamineSettings, Examine" requirePermission="false" />
@@ -29,7 +28,6 @@
 		<dashBoard configSource="config\Dashboard.config" />
 	</umbracoConfiguration>
 
-	<urlrewritingnet configSource="config\UrlRewriting.config" />
 	<microsoft.scripting configSource="config\scripting.config" />
 	<clientDependency configSource="config\ClientDependency.config" />
 	<Examine configSource="config\ExamineSettings.config" />
@@ -109,7 +107,6 @@
 			</controls>
 		</pages>
 		<httpModules>
-			<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
 			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
 			<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" />
 			<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
@@ -179,7 +176,7 @@
 				<remove assembly="System.Threading.Tasks.Parallel" />
 				<remove assembly="System.Xml.ReaderWriter" />
 				<remove assembly="System.Xml.XDocument" />
-				<remove assembly="System.Xml.XmlSerializer" />				
+				<remove assembly="System.Xml.XmlSerializer" />
 				<add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
 				<add assembly="Umbraco.ModelsBuilder"/>
@@ -232,7 +229,7 @@
 				<add assembly="System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Xml.ReaderWriter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 				<add assembly="System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-				<add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />				
+				<add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 			</assemblies>
 			<buildProviders>
 				<add extension=".cshtml" type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" />
@@ -251,8 +248,8 @@
 		<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
 			<providers>
 				<clear />
-				<add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed" />
-				<add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
+				<add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
+				<add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
 			</providers>
 		</membership>
 		<!-- Role Provider -->
@@ -274,9 +271,6 @@
 		<modules runAllManagedModulesForAllRequests="true">
 			<remove name="WebDAVModule" />
 
-			<remove name="UrlRewriteModule" />
-			<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
-
 			<remove name="UmbracoModule" />
 			<add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" />
 
@@ -346,7 +340,17 @@
 				<requestLimits maxAllowedContentLength="52428800" />
 			</requestFiltering>
 		</security>
-
+		
+		<!--
+		  If you wish to use IIS rewrite rules, see the documentation here: 
+		  https://our.umbraco.org/documentation/Reference/Routing/IISRewriteRules
+		-->
+		<!--
+		 <rewrite>
+			<rules></rules>
+		 </rewrite>
+		  -->
+		  
 	</system.webServer>
 
 	<runtime>
@@ -379,7 +383,7 @@
 			<!-- Ensure correct version of HtmlAgilityPack -->
 			<dependentAssembly>
 				<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
+				<bindingRedirect oldVersion="0.0.0.0-1.4.9.5" newVersion="1.4.9.5" />
 			</dependentAssembly>
 
 			<dependentAssembly>
@@ -391,10 +395,10 @@
         <assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
       </dependentAssembly>
-      
+
 			<dependentAssembly>
 				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+				<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
 			</dependentAssembly>
 
 			<dependentAssembly>
@@ -425,7 +429,10 @@
 				<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
 				<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
 			</dependentAssembly>
-
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
+      </dependentAssembly>
 		</assemblyBinding>
 	</runtime>
 
@@ -445,4 +452,5 @@
     <caching configSource="config\imageprocessor\cache.config" />
     <processing configSource="config\imageprocessor\processing.config" />
   </imageProcessor>
+  
 </configuration>