Bump version to 7.7.7

U4-10610 Cannot restore content templates

BUILD.md

@@ -14,6 +14,43 @@ By default, this builds the current version. It is possible to specify a differe
 
 Valid version strings are defined in the `Set-UmbracoVersion` documentation below.
 
+## PowerShell Quirks
+
+There is a good chance that running `build.ps1` ends up in error, with messages such as
+
+>The file ...\build\build.ps1 is not digitally signed. You cannot run this script on the current system. For more information about running scripts and setting execution policy, see about_Execution_Policies.
+
+PowerShell has *Execution Policies* that may prevent the script from running. You can check the current policies with:
+
+    PS> Get-ExecutionPolicy -List
+    
+            Scope ExecutionPolicy
+            ----- ---------------
+    MachinePolicy       Undefined
+       UserPolicy       Undefined
+          Process       Undefined
+      CurrentUser       Undefined
+     LocalMachine    RemoteSigned
+
+Policies can be `Restricted`, `AllSigned`, `RemoteSigned`, `Unrestricted` and `Bypass`. Scopes can be `MachinePolicy`, `UserPolicy`, `Process`, `CurrentUser`, `LocalMachine`. You need the current policy to be `RemoteSigned`—as long as it is `Undefined`, the script cannot run. You can change the current user policy with:
+
+    PS> Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy RemoteSigned
+
+Alternatively, you can do it at machine level, from within an elevated PowerShell session:
+
+    PS> Set-ExecutionPolicy -Scope LocalMachine -ExecutionPolicy RemoteSigned
+
+And *then* the script should run. It *might* however still complain about executing scripts, with messages such as:
+
+>Security warning - Run only scripts that you trust. While scripts from the internet can be useful, this script can potentially harm your computer. If you trust this script, use the Unblock-File cmdlet to allow the script to run without this warning message. Do you want to run ...\build\build.ps1?
+[D] Do not run  [R] Run once  [S] Suspend  [?] Help (default is "D"):
+
+This is usually caused by the scripts being *blocked*. And that usually happens when the source code has been downloaded as a Zip file. When Windows downloads Zip files, they are marked as *blocked* (technically, they have a Zone.Identifier alternate data stream, with a value of "3" to indicate that they were downloaded from the Internet). And when such a Zip file is un-zipped, each and every single file is also marked as blocked.
+
+The best solution is to unblock the Zip file before un-zipping: right-click the files, open *Properties*, and there should be a *Unblock* checkbox at the bottom of the dialog. If, however, the Zip file has already been un-zipped, it is possible to recursively unblock all files from PowerShell with:
+
+    PS> Get-ChildItem -Recurse *.* | Unblock-File
+
 ## Notes
 
 Git might have issues dealing with long file paths during build. You may want/need to enable `core.longpaths` support (see [this page](https://github.com/msysgit/msysgit/wiki/Git-cannot-create-a-file-or-directory-with-a-long-path) for details).

README.md

@@ -1,8 +1,8 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/ikpgqxiw9v8opltv/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-hs8dx/branch/dev-v7)
+[![Build status](https://ci.appveyor.com/api/projects/status/6by6harxtxt0ocdx/branch/dev-v7?svg=true)](https://ci.appveyor.com/project/Umbraco/umbraco-cms-b2cri/branch/dev-v7)
 
 Umbraco CMS
 ===========
-The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 390,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
+The friendliest, most flexible and fastest growing ASP.NET CMS used by more than 443,000 websites worldwide: [https://umbraco.com](https://umbraco.com)
 
 [![ScreenShot](vimeo.png)](https://vimeo.com/172382998/)
 
@@ -12,7 +12,7 @@ Umbraco is a free open source Content Management System built on the ASP.NET pla
 
 ## Building Umbraco from source ##
 
-The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`.
+The easiest way to get started is to run `build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`.  See [this page](BUILD.md) for more details.
 
 Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.
 
@@ -26,7 +26,7 @@ For the first time on the Microsoft platform, there is a free user and developer
 
 Umbraco is not only loved by developers, but is a content editors dream. Enjoy intuitive editing tools, media management, responsive views and approval workflows to send your content live.
 
-Used by more than 350,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 200,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
+Used by more than 443,000 active websites including Carlsberg, Segway, Amazon and Heinz and **The Official ASP.NET and IIS.NET website from Microsoft** ([https://asp.net](https://asp.net) / [https://iis.net](https://iis.net)), you can be sure that the technology is proven, stable and scales. Backed by the team at Umbraco HQ, and supported by a dedicated community of over 220,000 craftspeople globally, you can trust that Umbraco is a safe choice and is here to stay. 
 
 To view more examples, please visit [https://umbraco.com/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
 

build.bat

@@ -10,6 +10,5 @@ IF ERRORLEVEL 1 (
 :error
 ECHO.
 ECHO Can not run build\build.ps1.
-ECHO If this is due to a SecurityError then make sure to run the following command from an administrator command prompt:
+ECHO If this is due to a SecurityError then please refer to BUILD.md for help!
 ECHO.
-ECHO powershell Set-ExecutionPolicy -ExecutionPolicy RemoteSigned

build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1

@@ -7,45 +7,39 @@ function Build-UmbracoDocs
   $src = "$($uenv.SolutionRoot)\src"
   $out = "$($uenv.SolutionRoot)\build.out"
   $tmp = "$($uenv.SolutionRoot)\build.tmp"
-
+  
   $buildTemp = "$PSScriptRoot\temp"
   $cache = 2
-
+  
   Prepare-Build -keep $uenv
 
   ################ Do the UI docs
+  # get a temp clean node env (will restore)
+  Sandbox-Node $uenv
+  
+  Write-Host "Executing gulp docs"
+  
+  push-location "$($uenv.SolutionRoot)\src\Umbraco.Web.UI.Client"
+  write "node version is:" > $tmp\belle-docs.log
+  &node -v >> $tmp\belle-docs.log 2>&1
+  write "npm version is:" >> $tmp\belle-docs.log 2>&1
+  &npm -v >> $tmp\belle-docs.log 2>&1
+  write "executing npm install" >> $tmp\belle-docs.log 2>&1
+  &npm install >> $tmp\belle-docs.log 2>&1
+  write "executing bower install" >> $tmp\belle-docs.log 2>&1
+  &npm install -g bower >> $tmp\belle-docs.log 2>&1
+  write "installing gulp" >> $tmp\belle-docs.log 2>&1
+  &npm install -g gulp >> $tmp\belle-docs.log 2>&1
+  write "installing gulp-cli" >> $tmp\belle-docs.log 2>&1
+  &npm install -g gulp-cli --quiet >> $tmp\belle-docs.log 2>&1
+  write "building docs using gulp" >> $tmp\belle-docs.log 2>&1
+  &gulp docs >> $tmp\belle-docs.log 2>&1
+  pop-location  
 
-  # No need to build belle again if it exists
-  $belleAppJs = "$src\Umbraco.Web.UI\Umbraco\js\app.js"
-  if(-not (Test-Path $belleAppJs)) 
-  {
-	  # get a temp clean node env (will restore)
-	  Sandbox-Node $uenv
-	  
-	  push-location "$($uenv.SolutionRoot)\src\Umbraco.Web.UI.Client"
-	  write "node version is:" > $tmp\belle.log
-	  &node -v >> $tmp\belle.log 2>&1
-	  write "npm version is:" >> $tmp\belle.log 2>&1
-	  &npm -v >> $tmp\belle.log 2>&1
-	  write "cleaning npm cache" >> $tmp\belle.log 2>&1
-	  &npm cache clean >> $tmp\belle.log 2>&1
-	  write "installing bower" >> $tmp\belle.log 2>&1
-	  &npm install -g bower >> $tmp\belle.log 2>&1
-	  write "installing gulp" >> $tmp\belle.log 2>&1
-	  &npm install -g gulp >> $tmp\belle.log 2>&1
-	  write "installing gulp-cli" >> $tmp\belle.log 2>&1
-	  &npm install -g gulp-cli --quiet >> $tmp\belle.log 2>&1
-	  write "executing npm install" >> $tmp\belle.log 2>&1
-	  &npm install >> $tmp\belle.log 2>&1
-	  write "building docs using gulp" >> $tmp\belle.log 2>&1
-	  &gulp docs >> $tmp\belle.log 2>&1
-	  pop-location  
-
-	  # fixme - should we filter the log to find errors?
-	  #get-content .\build.tmp\belle-docs.log | %{ if ($_ -match "build") { write $_}}
-  } else {
-	  Write-Host "Skipping belle build, $belleAppJs already exists"
-  }
+  Write-Host "Completed gulp docs build"
+  
+  # fixme - should we filter the log to find errors?
+  #get-content .\build.tmp\belle-docs.log | %{ if ($_ -match "build") { write $_}}
   
   # change baseUrl
   $baseUrl = "https://our.umbraco.org/apidocs/ui/"

build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1

@@ -40,6 +40,7 @@ function Get-UmbracoBuildEnv
     &$nuget install 7-Zip.CommandLine -OutputDirectory $path -Verbosity quiet
     $dir = ls "$path\7-Zip.CommandLine.*" | sort -property Name -descending | select -first 1
     $file = ls -path "$dir" -name 7za.exe -recurse
+    $file = ls -path "$dir" -name 7za.exe -recurse | select -first 1 #A select is because there is tools\7za.exe & tools\x64\7za.exe
     mv "$dir\$file" $sevenZip
     Remove-Directory $dir
   }

build/Modules/Umbraco.Build/Umbraco.Build.psm1

@@ -51,13 +51,19 @@ function Prepare-Build
 
   if (-not $keep)
   {
-    Remove-Directory "$tmp"
-    mkdir "$tmp" > $null
-    
-    Remove-Directory "$out"
-    mkdir "$out" > $null
+	Remove-Directory "$tmp"
+	Remove-Directory "$out"
   }
 
+  if (-not (Test-Path "$tmp")) 
+  {
+    mkdir "$tmp" > $null
+  }
+  if (-not (Test-Path "$out")) 
+  {
+    mkdir "$out" > $null
+  }
+    
   # ensure proper web.config
   $webUi = "$src\Umbraco.Web.UI"
   Store-WebConfig $webUi
@@ -371,14 +377,6 @@ function Prepare-Packages
   Copy-Files "$src\Umbraco.Web.UI\umbraco\lib" "*" "$tmp\WebApp\umbraco\lib"
   Copy-Files "$src\Umbraco.Web.UI\umbraco\views" "*" "$tmp\WebApp\umbraco\views"
   Copy-Files "$src\Umbraco.Web.UI\umbraco\preview" "*" "$tmp\WebApp\umbraco\preview"
-
-  # prepare WebPI
-  Write-Host "Prepare WebPI"
-  Remove-Directory "$tmp\WebPi"
-  mkdir "$tmp\WebPi" > $null
-  mkdir "$tmp\WebPi\umbraco" > $null
-  Copy-Files "$tmp\WebApp" "*" "$tmp\WebPi\umbraco"
-  Copy-Files "$src\WebPi" "*" "$tmp\WebPi"     
 }
 
 #
@@ -407,17 +405,6 @@ function Package-Zip
     "$tmp\WebApp\*" `
     "-x!dotless.Core.*" "-x!Content_Types.xml" "-x!*.pdb"`
     > $null
-
-  Write-Host "Zip WebPI"  
-  &$uenv.Zip a -r "$out\UmbracoCms.WebPI.$($version.Semver).zip" "-x!*.pdb"`
-    "$tmp\WebPi\*" `
-    "-x!dotless.Core.*" `
-    > $null
-  
-    # hash the webpi file
-  Write-Host "Hash WebPI"
-  $hash = Get-FileHash "$out\UmbracoCms.WebPI.$($version.Semver).zip"
-  Write $hash | out-file "$out\webpihash.txt" -encoding ascii
 }
 
 #
@@ -461,6 +448,24 @@ function Restore-NuGet
   &$uenv.NuGet restore "$src\Umbraco.sln" > "$tmp\nuget.restore.log"
 }
 
+#
+# Copies the Azure Gallery script to output
+#
+function Prepare-AzureGallery
+{
+  param (
+    $uenv # an Umbraco build environment (see Get-UmbracoBuildEnv)
+  )
+  
+  $src = "$($uenv.SolutionRoot)\src"
+  $tmp = "$($uenv.SolutionRoot)\build.tmp"
+  $out = "$($uenv.SolutionRoot)\build.out"
+  $psScript = "$($uenv.SolutionRoot)\build\azuregalleryrelease.ps1"
+  
+  Write-Host ">> Copy azuregalleryrelease.ps1 to output folder"
+  Copy-Item $psScript $out
+}
+
 #
 # Creates the NuGet packages
 #
@@ -570,6 +575,10 @@ function Build-Umbraco
   {
     Compile-Belle $uenv $version
   }
+  elseif ($target -eq "prepare-azuregallery")
+  {
+    Prepare-AzureGallery $uenv
+  }
   elseif ($target -eq "all")
   {
     Prepare-Build $uenv
@@ -584,6 +593,7 @@ function Build-Umbraco
     Verify-NuGet $uenv
     Prepare-NuGet $uenv
     Package-NuGet $uenv $version
+	Prepare-AzureGallery $uenv
   }
   else
   {

build/Modules/Umbraco.Build/Utilities.ps1

@@ -1,28 +1,3 @@
-# returns a string containing the hash of $file
-function Get-FileHash($file) 
-{
-  try 
-  {
-    $crypto = new-object System.Security.Cryptography.SHA1CryptoServiceProvider
-    $stream = [System.IO.File]::OpenRead($file)
-    $hash = $crypto.ComputeHash($stream)
-    $text = ""
-    $hash | foreach `
-    {
-      $text = $text + $_.ToString("x2")
-    }
-    return $text
-  }
-  finally
-  {
-    if ($stream)
-    {
-      $stream.Dispose()
-    }
-    $crypto.Dispose()
-  }
-}
-
 # returns the full path if $file is relative to $pwd
 function Get-FullPath($file)
 {

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -29,18 +29,17 @@
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
       <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
       <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
       <dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
       <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Examine" version="[0.1.85, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.5.3, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.8.3, 5.0.0)" />
+      <dependency id="Examine" version="[0.1.88, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 3.0.0)" />
 	    <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
       <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
     </dependencies>
   </metadata>
   <files>

build/NuSpecs/UmbracoCms.nuspec

@@ -19,7 +19,7 @@
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
       <dependency id="Umbraco.ModelsBuilder" version="[3.0.7, 4.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
-	  <dependency id="ImageProcessor.Web.Config" version="[2.3.0, 3.0.0)" />
+	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
     </dependencies>
   </metadata>
   <files>

build/NuSpecs/tools/trees.config.install.xdt

@@ -43,7 +43,7 @@
        xdt:Locator="Match(application,alias)"
        xdt:Transform="InsertIfMissing"  />
   
-  <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" 
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
   <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" 

build/azuregalleryrelease.ps1

@@ -0,0 +1,59 @@
+Param(
+ [string]$GitHubPersonalAccessToken,
+ [string]$Directory
+)
+$workingDirectory = $Directory
+CD $workingDirectory
+
+# Clone repo
+$fullGitUrl = "https://$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
+git clone $fullGitUrl 2>&1 | % { $_.ToString() } 
+
+# Remove everything so that unzipping the release later will update everything
+# Don't remove the readme file nor the git directory
+Write-Host "Cleaning up git directory before adding new version"
+Remove-Item -Recurse $workingDirectory\$env:GIT_REPOSITORYNAME\* -Exclude README.md,.git
+
+# Find release zip
+$zipsDir = "$workingDirectory\$env:BUILD_DEFINITIONNAME\zips"
+$pattern = "UmbracoCms.([0-9]{1,2}.[0-9]{1,3}.[0-9]{1,3}).zip"
+Write-Host "Searching for Umbraco release files in $workingDirectory\$zipsDir for a file with pattern $pattern"
+$file = (Get-ChildItem $zipsDir | Where-Object { $_.Name -match "$pattern" })
+
+if($file)
+{
+    # Get release name
+    $version = [regex]::Match($file.Name, $pattern).captures.groups[1].value
+    $releaseName = "Umbraco $version"
+    Write-Host "Found $releaseName"
+    
+    # Unzip into repository to update release
+    Add-Type -AssemblyName System.IO.Compression.FileSystem
+    Write-Host "Unzipping $($file.FullName) to $workingDirectory\$env:GIT_REPOSITORYNAME"
+    [System.IO.Compression.ZipFile]::ExtractToDirectory("$($file.FullName)", "$workingDirectory\$env:GIT_REPOSITORYNAME")
+    
+    # Telling git who we are
+    git config --global user.email "coffee@umbraco.com" 2>&1 | % { $_.ToString() }
+    git config --global user.name "Umbraco HQ" 2>&1 | % { $_.ToString() }
+    
+    # Commit
+    CD $env:GIT_REPOSITORYNAME
+    Write-Host "Committing Umbraco $version Release from Build Output"
+
+    git add . 2>&1 | % { $_.ToString() } 
+    git commit -m " Release $releaseName from Build Output" 2>&1 | % { $_.ToString() } 
+
+    # Tag the release
+    git tag -a "v$version" -m "v$version"
+
+    # Push release to master
+    $fullGitAuthUrl = "https://$($env:GIT_USERNAME):$GitHubPersonalAccessToken@$env:GIT_URL/$env:GIT_REPOSITORYNAME.git"
+    git push $fullGitAuthUrl 2>&1 | % { $_.ToString() } 
+
+    #Push tag to master
+    git push $fullGitAuthUrl --tags 2>&1 | % { $_.ToString() }
+}
+else
+{
+    Write-Error "Umbraco release file not found, searched in $workingDirectory\$zipsDir for a file with pattern $pattern - cancelling"
+}

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.7.1")]
-[assembly: AssemblyInformationalVersion("7.7.1")]
+[assembly: AssemblyFileVersion("7.7.7")]
+[assembly: AssemblyInformationalVersion("7.7.7")]

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -538,24 +538,41 @@ namespace Umbraco.Core.Configuration
 
         internal static bool ContentCacheXmlStoredInCodeGen
         {
-            get { return ContentCacheXmlStorageLocation == ContentXmlStorage.AspNetTemp; }
+            get { return LocalTempStorageLocation == LocalTempStorage.AspNetTemp; }
         }
-
-        internal static ContentXmlStorage ContentCacheXmlStorageLocation
+
+        /// <summary>
+        /// This is the location type to store temporary files such as cache files or other localized files for a given machine
+        /// </summary>
+        /// <remarks>
+        /// Currently used for the xml cache file and the plugin cache files
+        /// </remarks>
+        internal static LocalTempStorage LocalTempStorageLocation
         {
             get
-            {
+            {
+                //there's a bunch of backwards compat config checks here....
+
+                //This is the current one
+                if (ConfigurationManager.AppSettings.ContainsKey("umbracoLocalTempStorage"))
+                {
+                    return Enum<LocalTempStorage>.Parse(ConfigurationManager.AppSettings["umbracoLocalTempStorage"]);
+                }
+
+                //This one is old
                 if (ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLStorage"))
                 {
-                    return Enum<ContentXmlStorage>.Parse(ConfigurationManager.AppSettings["umbracoContentXMLStorage"]);
-                }
+                    return Enum<LocalTempStorage>.Parse(ConfigurationManager.AppSettings["umbracoContentXMLStorage"]);
+                }
+
+                //This one is older
                 if (ConfigurationManager.AppSettings.ContainsKey("umbracoContentXMLUseLocalTemp"))
                 {
                     return bool.Parse(ConfigurationManager.AppSettings["umbracoContentXMLUseLocalTemp"]) 
-                        ? ContentXmlStorage.AspNetTemp 
-                        : ContentXmlStorage.Default;
+                        ? LocalTempStorage.AspNetTemp 
+                        : LocalTempStorage.Default;
                 }
-                return ContentXmlStorage.Default;
+                return LocalTempStorage.Default;
             }
         }
 

src/Umbraco.Core/Configuration/LocalTempStorage.cs

@@ -1,6 +1,6 @@
 namespace Umbraco.Core.Configuration
 {
-    internal enum ContentXmlStorage
+    internal enum LocalTempStorage
     {
         Default,
         AspNetTemp,

src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs

@@ -357,6 +357,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         string IContentSection.LoginBackgroundImage
         {
             get { return LoginBackgroundImage; }
-        }
+        }
+        
     }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs

@@ -74,6 +74,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
         bool EnablePropertyValueConverters { get; }
 
-        string LoginBackgroundImage { get; }
+        string LoginBackgroundImage { get; }
+        
     }
 }

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.7.1");
+        private static readonly Version Version = new Version("7.7.7");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/IO/IOHelper.cs

@@ -13,11 +13,28 @@ using Umbraco.Core.Configuration;
 namespace Umbraco.Core.IO
 {
 	public static class IOHelper
-    {
+	{
+        /// <summary>
+        /// Gets or sets a value forcing Umbraco to consider it is non-hosted.
+        /// </summary>
+        /// <remarks>This should always be false, unless unit testing.</remarks>
+	    public static bool ForceNotHosted { get; set; }
+
         private static string _rootDir = "";
 
         // static compiled regex for faster performance
         private readonly static Regex ResolveUrlPattern = new Regex("(=[\"\']?)(\\W?\\~(?:.(?![\"\']?\\s+(?:\\S+)=|[>\"\']))+.)[\"\']?", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+
+        /// <summary>
+        /// Gets a value indicating whether Umbraco is hosted.
+        /// </summary>
+	    public static bool IsHosted
+	    {
+	        get
+	        {
+	            return ForceNotHosted == false && (HttpContext.Current != null || HostingEnvironment.IsHosted);
+            }
+	    }
 
         public static char DirSepChar
         {
@@ -72,14 +89,14 @@ namespace Umbraco.Core.IO
         internal static string ResolveUrlsFromTextString(string text)
         {
             if (UmbracoConfig.For.UmbracoSettings().Content.ResolveUrlsFromTextString)
-            {				
+            {
 				using (DisposableTimer.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete"))
 				{
 					// find all relative urls (ie. urls that contain ~)
 					var tags = ResolveUrlPattern.Matches(text);
-					
+
 					foreach (Match tag in tags)
-					{						
+					{
 						string url = "";
 						if (tag.Groups[1].Success)
 							url = tag.Groups[1].Value;
@@ -97,7 +114,8 @@ namespace Umbraco.Core.IO
 
         public static string MapPath(string path, bool useHttpContext)
         {
-            if (path == null) throw new ArgumentNullException("path");
+            if (path == null) throw new ArgumentNullException("path");
+            useHttpContext = useHttpContext && IsHosted;
 
             // Check if the path is already mapped
             if ((path.Length >= 2 && path[1] == Path.VolumeSeparatorChar)
@@ -303,7 +321,7 @@ namespace Umbraco.Core.IO
             var debugFolder = Path.Combine(binFolder, "debug");
             if (Directory.Exists(debugFolder))
                 return debugFolder;
-#endif   
+#endif
             var releaseFolder = Path.Combine(binFolder, "release");
             if (Directory.Exists(releaseFolder))
                 return releaseFolder;

src/Umbraco.Core/IO/SystemFiles.cs

@@ -73,19 +73,19 @@ namespace Umbraco.Core.IO
         {
             get
             {
-                switch (GlobalSettings.ContentCacheXmlStorageLocation)
+                switch (GlobalSettings.LocalTempStorageLocation)
                 {                    
-                    case ContentXmlStorage.AspNetTemp:
+                    case LocalTempStorage.AspNetTemp:
                         return Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco.config");
-                    case ContentXmlStorage.EnvironmentTemp:
+                    case LocalTempStorage.EnvironmentTemp:
                         var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
-                        var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoXml",
-                            //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
-                            // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
-                            // utilizing an old path
+                        var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                            //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                            // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                            // utilizing an old path
                             appDomainHash);
                         return Path.Combine(cachePath, "umbraco.config");
-                    case ContentXmlStorage.Default:
+                    case LocalTempStorage.Default:
                         return IOHelper.ReturnPath("umbracoContentXML", "~/App_Data/umbraco.config");
                     default:
                         throw new ArgumentOutOfRangeException();

src/Umbraco.Core/Logging/RollingFileCleanupAppender.cs

@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+using log4net.Appender;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+    /// <summary>
+    /// This class will do the exact same thing as the RollingFileAppender that comes from log4net
+    /// With the extension, that it is able to do automatic cleanup of the logfiles in the directory where logging happens
+    /// 
+    /// By specifying the properties MaxLogFileDays and BaseFilePattern, the files will automaticly get deleted when
+    /// the logger is configured(typically when the app starts). To utilize this appender swap out the type of the rollingFile appender
+    /// that ships with Umbraco, to be Umbraco.Core.Logging.RollingFileCleanupAppender, and add the maxLogFileDays and baseFilePattern elements 
+    /// to the configuration i.e.:
+    /// 
+    /// <example>
+    ///  <appender name="rollingFile" type="Log4netAwesomeness.CustomRollingFileAppender, Log4netAwesomeness">
+    ///	  <file type="log4net.Util.PatternString" value="App_Data\Logs\UmbracoTraceLog.%property{log4net:HostName}.txt" />
+    ///    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    ///    <appendToFile value="true" />
+    ///    <rollingStyle value="Date" />
+    ///    <maximumFileSize value="5MB" />
+    ///    <maxLogFileDays value="5"/>
+    ///    <basefilePattern value="UmbracoTraceLog.*.txt.*"/>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <encoding value="utf-8" />
+    ///  </appender>
+    /// </example>
+    /// </summary>
+    public class RollingFileCleanupAppender : RollingFileAppender
+    {
+        public int MaxLogFileDays { get; set; }
+        public string BaseFilePattern { get; set; }
+
+        /// <summary>
+        /// This override will delete logs older than the specified amount of days
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="append"></param>
+        protected override void OpenFile(string fileName, bool append)
+        {
+            bool cleanup = true;
+            // Validate settings and input
+            if (MaxLogFileDays <= 0)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'MaxLogFileDays' needs to be a positive integer, aborting cleanup");
+                cleanup = false;
+            }
+
+            if (string.IsNullOrWhiteSpace(BaseFilePattern))
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'BaseFilePattern' is empty, aborting cleanup");
+                cleanup = false;
+            }
+            // grab the directory we are logging to, as this is were we will search for older logfiles
+            var logFolder = Path.GetDirectoryName(fileName);
+            if (Directory.Exists(logFolder) == false)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), string.Format("Directory '{0}' for logfiles does not exist, aborting cleanup", logFolder));
+                cleanup = false;
+            }
+            // If everything is validated, we can do the actual cleanup
+            if (cleanup)
+            {
+                Cleanup(logFolder);
+            }
+
+            base.OpenFile(fileName, append);
+        }
+
+        private void Cleanup(string directoryPath)
+        {
+            // only take files that matches the pattern we are using i.e. UmbracoTraceLog.*.txt.*
+            string[] logFiles = Directory.GetFiles(directoryPath, BaseFilePattern);
+            LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Found {0} files that matches the baseFilePattern: '{1}'", logFiles.Length, BaseFilePattern));
+
+            foreach (var logFile in logFiles)
+            {
+                DateTime lastAccessTime = System.IO.File.GetLastWriteTimeUtc(logFile);
+                // take the value from the config file
+                if (lastAccessTime < DateTime.Now.AddDays(-MaxLogFileDays))
+                {
+                    LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Deleting file {0} as its lastAccessTime is older than {1} days speficied by MaxLogFileDays", logFile, MaxLogFileDays));
+                    base.DeleteFile(logFile);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs

@@ -42,6 +42,14 @@ namespace Umbraco.Core.Models.Identity
 
         private BackOfficeIdentityUser()
         {
+            _startMediaIds = new int[] { };
+            _startContentIds = new int[] { };
+            _groups = new IReadOnlyUserGroup[] { };
+            _allowedSections = new string[] { };
+            _culture = Configuration.GlobalSettings.DefaultUILanguage;
+            _groups = new IReadOnlyUserGroup[0];
+            _roles = new ObservableCollection<IdentityUserRole<string>>();
+            _roles.CollectionChanged += _roles_CollectionChanged;
         }
 
         /// <summary>

src/Umbraco.Core/Models/Membership/EntityPermissionCollection.cs

@@ -17,7 +17,30 @@ namespace Umbraco.Core.Models.Membership
         }
 
         /// <summary>
-        /// Returns the aggregate permissions in the permission set
+        /// Returns the aggregate permissions in the permission set for a single node
+        /// </summary>
+        /// <returns></returns>
+        /// <remarks>
+        /// This value is only calculated once per node
+        /// </remarks>
+        public IEnumerable<string> GetAllPermissions(int entityId)
+        {
+            if (_aggregateNodePermissions == null)
+                _aggregateNodePermissions = new Dictionary<int, string[]>();
+
+            string[] entityPermissions;
+            if (_aggregateNodePermissions.TryGetValue(entityId, out entityPermissions) == false)
+            {
+                entityPermissions = this.Where(x => x.EntityId == entityId).SelectMany(x => x.AssignedPermissions).Distinct().ToArray();
+                _aggregateNodePermissions[entityId] = entityPermissions;
+            }
+            return entityPermissions;
+        }
+
+        private Dictionary<int, string[]> _aggregateNodePermissions;
+
+        /// <summary>
+        /// Returns the aggregate permissions in the permission set for all nodes
         /// </summary>
         /// <returns></returns>
         /// <remarks>

src/Umbraco.Core/Models/Membership/UserGroup.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Models.Membership
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    internal class UserGroup : Entity, IUserGroup, IReadOnlyUserGroup
+    public class UserGroup : Entity, IUserGroup, IReadOnlyUserGroup
     {
         private int? _startContentId;
         private int? _startMediaId;

src/Umbraco.Core/Models/UmbracoObjectTypes.cs

@@ -188,7 +188,7 @@ namespace Umbraco.Core.Models
         Language,
 
         /// <summary>
-        /// Document
+        /// Document Blueprint
         /// </summary>
         [UmbracoObjectType(Constants.ObjectTypes.DocumentBlueprint, typeof(IContent))]
         [FriendlyName("DocumentBlueprint")]

src/Umbraco.Core/Persistence/LocalDb.cs

@@ -24,6 +24,7 @@ namespace Umbraco.Core.Persistence
     {
         private int _version;
         private bool _hasVersion;
+        private string _exe;
 
         #region Availability & Version
 
@@ -84,16 +85,31 @@ namespace Umbraco.Core.Persistence
         {
             _hasVersion = true;
             _version = -1;
+            _exe = null;
 
             var programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
-            if (programFiles == null) return;
+
+            // MS SQL Server installs in e.g. "C:\Program Files\Microsoft SQL Server", so
+            // we want to detect it in "%ProgramFiles%\Microsoft SQL Server" - however, if
+            // Umbraco runs as a 32bits process (e.g. IISExpress configured as 32bits)
+            // on a 64bits system, %ProgramFiles% will point to "C:\Program Files (x86)"
+            // and SQL Server cannot be found. But then, %ProgramW6432% will point to
+            // the original "C:\Program Files". Using it to fix the path.
+            // see also: MSDN doc for WOW64 implementation
+            //
+            var programW6432 = Environment.GetEnvironmentVariable("ProgramW6432");
+            if (string.IsNullOrWhiteSpace(programW6432) == false && programW6432 != programFiles)
+                programFiles = programW6432;
+
+            if (string.IsNullOrWhiteSpace(programFiles)) return;
 
             // detect 14, 13, 12, 11
             for (var i = 14; i > 10; i--)
             {
-                var path = Path.Combine(programFiles, string.Format(@"Microsoft SQL Server\{0}0\Tools\Binn\SqlLocalDB.exe", i));
-                if (File.Exists(path) == false) continue;
+                var exe = Path.Combine(programFiles, string.Format(@"Microsoft SQL Server\{0}0\Tools\Binn\SqlLocalDB.exe", i));
+                if (File.Exists(exe) == false) continue;
                 _version = i;
+                _exe = exe;
                 break;
             }
         }
@@ -897,16 +913,13 @@ namespace Umbraco.Core.Persistence
         /// </remarks>
         private int ExecuteSqlLocalDb(string args, out string output, out string error)
         {
-            var programFiles = Environment.GetEnvironmentVariable("ProgramFiles");
-            if (programFiles == null)
+            if (_exe == null) // should never happen - we should not execute if not available
             {
                 output = string.Empty;
                 error = "SqlLocalDB.exe not found";
                 return -1;
             }
 
-            var path = Path.Combine(programFiles, string.Format(@"Microsoft SQL Server\{0}0\Tools\Binn\SqlLocalDB.exe", _version));
-
             var p = new Process
             {
                 StartInfo =
@@ -914,7 +927,7 @@ namespace Umbraco.Core.Persistence
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
-                    FileName = path,
+                    FileName = _exe,
                     Arguments = args,
                     CreateNoWindow = true,
                     WindowStyle = ProcessWindowStyle.Hidden
@@ -929,7 +942,7 @@ namespace Umbraco.Core.Persistence
         }
 
         /// <summary>
-        /// Returns a Unicode string with the delimiters added to make the input string a valid SQL Server delimited identifier. 
+        /// Returns a Unicode string with the delimiters added to make the input string a valid SQL Server delimited identifier.
         /// </summary>
         /// <param name="name">The name to quote.</param>
         /// <param name="quote">A quote character.</param>

src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs

@@ -134,7 +134,9 @@ namespace Umbraco.Core.Persistence.Repositories
                 .InnerJoin<ContentDto>(SqlSyntax)
                 .On<ContentVersionDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                 .InnerJoin<NodeDto>(SqlSyntax)
-                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId);
+                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentTypeDto>()
+                .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId);
             //TODO: IF we want to enable querying on content type information this will need to be joined
             //.InnerJoin<ContentTypeDto>(SqlSyntax)
             //.On<ContentDto, ContentTypeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId, SqlSyntax);
@@ -833,11 +835,21 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
 
         }
 
-        public int CountPublished()
-        {
-            var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
-                .Where<DocumentDto>(x => x.Published == true);
-            return Database.ExecuteScalar<int>(sql);
+        public int CountPublished(string contentTypeAlias = null)
+        {
+            if (contentTypeAlias.IsNullOrWhiteSpace())
+            {
+                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
+                .Where<DocumentDto>(x => x.Published == true);
+                return Database.ExecuteScalar<int>(sql);
+            }
+            else
+            {
+                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
+                .Where<DocumentDto>(x => x.Published == true)
+                .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+                return Database.ExecuteScalar<int>(sql);
+            }
         }
 
         public void ReplaceContentPermissions(EntityPermissionSet permissionSet)

src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs

@@ -26,7 +26,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <remarks>
         /// We require this on the repo because the IQuery{IContent} cannot supply the 'newest' parameter
         /// </remarks>
-        int CountPublished();
+        int CountPublished(string contentTypeAlias = null);
 
         /// <summary>
         /// Used to bulk update the permissions set for a content item. This will replace all permissions

src/Umbraco.Core/Persistence/Repositories/UserRepository.cs

@@ -191,11 +191,11 @@ ORDER BY colName";
 
             return new Dictionary<UserState, int>
             {
-                {UserState.All, result[0].num},
-                {UserState.Active, result[1].num},
-                {UserState.Disabled, result[2].num},
-                {UserState.LockedOut, result[3].num},
-                {UserState.Invited, result[4].num}
+                {UserState.All, (int)result[0].num},
+                {UserState.Active, (int)result[1].num},
+                {UserState.Disabled, (int)result[2].num},
+                {UserState.LockedOut, (int)result[3].num},
+                {UserState.Invited, (int)result[4].num}
             };
         }
 

src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs

@@ -687,8 +687,8 @@ ORDER BY contentNodeId, versionId, propertytypeid
                 case "NAME":
                     return "umbracoNode.text";
                 case "PUBLISHED":
-                case "OWNER":
                     return "cmsDocument.published";
+                case "OWNER":
                     //TODO: This isn't going to work very nicely because it's going to order by ID, not by letter
                     return "umbracoNode.nodeUser";
                 // Members only

src/Umbraco.Core/PluginManager.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading;
+using System.Web;
 using System.Web.Compilation;
 using Umbraco.Core.Cache;
 using Umbraco.Core.IO;
@@ -15,6 +16,7 @@ using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.PropertyEditors;
 using umbraco.interfaces;
+using Umbraco.Core.Configuration;
 using File = System.IO.File;
 
 namespace Umbraco.Core
@@ -39,7 +41,8 @@ namespace Umbraco.Core
         private readonly IServiceProvider _serviceProvider;
         private readonly IRuntimeCacheProvider _runtimeCache;
         private readonly ProfilingLogger _logger;
-        private readonly string _tempFolder;
+        private readonly Lazy<string> _pluginListFilePath = new Lazy<string>(GetPluginListFilePath);
+        private readonly Lazy<string> _pluginHashFilePath = new Lazy<string>(GetPluginHashFilePath);
 
         private readonly object _typesLock = new object();
         private readonly Dictionary<TypeListKey, TypeList> _types = new Dictionary<TypeListKey, TypeList>();
@@ -65,14 +68,7 @@ namespace Umbraco.Core
             _serviceProvider = serviceProvider;
             _runtimeCache = runtimeCache;
             _logger = logger;
-
-            // the temp folder where the cache file lives
-            _tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
-            if (Directory.Exists(_tempFolder) == false)
-                Directory.CreateDirectory(_tempFolder);
-
-            var pluginListFile = GetPluginListFilePath();
-
+            
             if (detectChanges)
             {
                 //first check if the cached hash is string.Empty, if it is then we need
@@ -84,7 +80,8 @@ namespace Umbraco.Core
                     // if the hash has changed, clear out the persisted list no matter what, this will force
                     // rescanning of all plugin types including lazy ones.
                     // http://issues.umbraco.org/issue/U4-4789
-                    File.Delete(pluginListFile);
+                    if(File.Exists(_pluginListFilePath.Value))
+                        File.Delete(_pluginListFilePath.Value);
 
                     WriteCachePluginsHash();
                 }
@@ -94,7 +91,8 @@ namespace Umbraco.Core
                 // if the hash has changed, clear out the persisted list no matter what, this will force
                 // rescanning of all plugin types including lazy ones.
                 // http://issues.umbraco.org/issue/U4-4789
-                File.Delete(pluginListFile);
+                if (File.Exists(_pluginListFilePath.Value))
+                    File.Delete(_pluginListFilePath.Value);
 
                 // always set to true if we're not detecting (generally only for testing)
                 RequiresRescanning = true;
@@ -187,11 +185,10 @@ namespace Umbraco.Core
             {
                 if (_cachedAssembliesHash != null)
                     return _cachedAssembliesHash;
+                
+                if (File.Exists(_pluginHashFilePath.Value) == false) return string.Empty;
 
-                var filePath = GetPluginHashFilePath();
-                if (File.Exists(filePath) == false) return string.Empty;
-
-                var hash = File.ReadAllText(filePath, Encoding.UTF8);
+                var hash = File.ReadAllText(_pluginHashFilePath.Value, Encoding.UTF8);
 
                 _cachedAssembliesHash = hash;
                 return _cachedAssembliesHash;
@@ -210,7 +207,7 @@ namespace Umbraco.Core
                     return _currentAssembliesHash;
 
                 _currentAssembliesHash = GetFileHash(new List<Tuple<FileSystemInfo, bool>>
-					{
+                    {
 						// the bin folder and everything in it
 						new Tuple<FileSystemInfo, bool>(new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Bin)), false),
 						// the app code folder and everything in it
@@ -219,7 +216,7 @@ namespace Umbraco.Core
 						new Tuple<FileSystemInfo, bool>(new FileInfo(IOHelper.MapPath("~/global.asax")), false),
                         // trees.config - use the contents to create the hash since this gets resaved on every app startup!
                         new Tuple<FileSystemInfo, bool>(new FileInfo(IOHelper.MapPath(SystemDirectories.Config + "/trees.config")), true)
-					}, _logger);
+                    }, _logger);
 
                 return _currentAssembliesHash;
             }
@@ -229,9 +226,8 @@ namespace Umbraco.Core
         /// Writes the assembly hash file.
         /// </summary>
         private void WriteCachePluginsHash()
-        {
-            var filePath = GetPluginHashFilePath();
-            File.WriteAllText(filePath, CurrentAssembliesHash.ToString(), Encoding.UTF8);
+        {        
+            File.WriteAllText(_pluginHashFilePath.Value, CurrentAssembliesHash, Encoding.UTF8);
         }
 
         /// <summary>
@@ -274,7 +270,7 @@ namespace Umbraco.Core
                             }
                         }
                     }
-                    return generator.GenerateHash();
+                    return generator.GenerateHash();
                 }
             }
         }
@@ -314,7 +310,7 @@ namespace Umbraco.Core
                         uniqInfos.Add(fileOrFolder.FullName);
                         generator.AddFileSystemItem(fileOrFolder);
                     }
-                    return generator.GenerateHash();
+                    return generator.GenerateHash();
                 }
             }
         }
@@ -347,12 +343,11 @@ namespace Umbraco.Core
             {
                 return ReadCache();
             }
-            catch
+            catch (Exception ex)
             {
                 try
                 {
-                    var filePath = GetPluginListFilePath();
-                    File.Delete(filePath);
+                    File.Delete(_pluginListFilePath.Value);
                 }
                 catch
                 {
@@ -366,12 +361,11 @@ namespace Umbraco.Core
         internal Dictionary<Tuple<string, string>, IEnumerable<string>> ReadCache()
         {
             var cache = new Dictionary<Tuple<string, string>, IEnumerable<string>>();
-
-            var filePath = GetPluginListFilePath();
-            if (File.Exists(filePath) == false)
+            
+            if (File.Exists(_pluginListFilePath.Value) == false)
                 return cache;
 
-            using (var stream = GetFileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read, ListFileOpenReadTimeout))
+            using (var stream = GetFileStream(_pluginListFilePath.Value, FileMode.Open, FileAccess.Read, FileShare.Read, ListFileOpenReadTimeout))
             using (var reader = new StreamReader(stream))
             {
                 while (true)
@@ -414,38 +408,86 @@ namespace Umbraco.Core
         /// <remarks>Generally only used for resetting cache, for example during the install process.</remarks>
         public void ClearPluginCache()
         {
-            var path = GetPluginListFilePath();
-            if (File.Exists(path))
-                File.Delete(path);
-
-            path = GetPluginHashFilePath();
-            if (File.Exists(path))
-                File.Delete(path);
+            if (File.Exists(_pluginListFilePath.Value))
+                File.Delete(_pluginListFilePath.Value);
+            
+            if (File.Exists(_pluginHashFilePath.Value))
+                File.Delete(_pluginHashFilePath.Value);
 
             _runtimeCache.ClearCacheItem(CacheKey);
         }
 
-        private string GetPluginListFilePath()
+        private static string GetPluginListFilePath()
         {
-            var filename = "umbraco-plugins." + NetworkHelper.FileSafeMachineName + ".list";
-            return Path.Combine(_tempFolder, filename);
+            string pluginListFilePath;
+            switch (GlobalSettings.LocalTempStorageLocation)
+            {                
+                case LocalTempStorage.AspNetTemp:
+                    pluginListFilePath = Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco-plugins.list");
+                    break;
+                case LocalTempStorage.EnvironmentTemp:
+                    var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
+                    var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                        //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                        // utilizing an old path
+                        appDomainHash);
+                    pluginListFilePath = Path.Combine(cachePath, "umbraco-plugins.list");
+                    break;
+                case LocalTempStorage.Default:                    
+                default:
+                    var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
+                    pluginListFilePath = Path.Combine(tempFolder, "umbraco-plugins." + NetworkHelper.FileSafeMachineName + ".list");
+                    break;
+            }
+
+            //ensure the folder exists
+            var folder = Path.GetDirectoryName(pluginListFilePath);
+            if (folder == null)
+                throw new InvalidOperationException("The folder could not be determined for the file " + pluginListFilePath);
+            if (Directory.Exists(folder) == false)
+                Directory.CreateDirectory(folder);
+
+            return pluginListFilePath;
         }
 
-        private string GetPluginHashFilePath()
+        private static string GetPluginHashFilePath()
         {
-            var filename = "umbraco-plugins." + NetworkHelper.FileSafeMachineName + ".hash";
-            return Path.Combine(_tempFolder, filename);
+            string pluginHashFilePath;
+            switch (GlobalSettings.LocalTempStorageLocation)
+            {
+                case LocalTempStorage.AspNetTemp:
+                    pluginHashFilePath = Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData\umbraco-plugins.hash");
+                    break;
+                case LocalTempStorage.EnvironmentTemp:
+                    var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
+                    var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                        //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                        // utilizing an old path
+                        appDomainHash);
+                    pluginHashFilePath = Path.Combine(cachePath, "umbraco-plugins.hash");
+                    break;
+                case LocalTempStorage.Default:
+                default:
+                    var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/PluginCache");
+                    pluginHashFilePath =  Path.Combine(tempFolder, "umbraco-plugins." + NetworkHelper.FileSafeMachineName + ".hash");
+                    break;
+            }
+
+            //ensure the folder exists
+            var folder = Path.GetDirectoryName(pluginHashFilePath);
+            if (folder == null)
+                throw new InvalidOperationException("The folder could not be determined for the file " + pluginHashFilePath);
+            if (Directory.Exists(folder) == false)
+                Directory.CreateDirectory(folder);
+            
+            return pluginHashFilePath;
         }
 
         internal void WriteCache()
         {
-            // be absolutely sure
-            if (Directory.Exists(_tempFolder) == false)
-                Directory.CreateDirectory(_tempFolder);
-
-            var filePath = GetPluginListFilePath();
-
-            using (var stream = GetFileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, ListFileOpenWriteTimeout))
+            using (var stream = GetFileStream(_pluginListFilePath.Value, FileMode.Create, FileAccess.Write, FileShare.None, ListFileOpenWriteTimeout))
             using (var writer = new StreamWriter(stream))
             {
                 foreach (var typeList in _types.Values)
@@ -461,8 +503,7 @@ namespace Umbraco.Core
 
         internal void UpdateCache()
         {
-            // note
-            // at the moment we write the cache to disk every time we update it. ideally we defer the writing
+            // TODO: at the moment we write the cache to disk every time we update it. ideally we defer the writing
             // since all the updates are going to happen in a row when Umbraco starts. that being said, the
             // file is small enough, so it is not a priority.
             WriteCache();
@@ -475,13 +516,13 @@ namespace Umbraco.Core
             while (true)
             {
                 try
-                {
+                {
                     return new FileStream(path, fileMode, fileAccess, fileShare);
                 }
-                catch
+                catch (Exception ex)
                 {
                     if (--attempts == 0)
-                        throw;
+                        throw;
 
                     LogHelper.Debug<PluginManager>(string.Format("Attempted to get filestream for file {0} failed, {1} attempts left, pausing for {2} milliseconds", path, attempts, pauseMilliseconds));
                     Thread.Sleep(pauseMilliseconds);
@@ -560,7 +601,7 @@ namespace Umbraco.Core
             if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false)
             {
                 return ResolveTypesInternal(
-                    typeof (T), null,
+                    typeof(T), null,
                     () => TypeFinder.FindClassesOfType<T>(specificAssemblies ?? AssembliesToScan),
                     cache);
             }
@@ -569,14 +610,14 @@ namespace Umbraco.Core
             // filter the cached discovered types (and cache the result)
 
             var discovered = ResolveTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                 true);
 
             return ResolveTypesInternal(
-                typeof (T), null,
+                typeof(T), null,
                 () => discovered
-                    .Where(x => typeof (T).IsAssignableFrom(x)),
+                    .Where(x => typeof(T).IsAssignableFrom(x)),
                 true);
         }
 
@@ -599,7 +640,7 @@ namespace Umbraco.Core
             if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false)
             {
                 return ResolveTypesInternal(
-                    typeof (T), typeof (TAttribute),
+                    typeof(T), typeof(TAttribute),
                     () => TypeFinder.FindClassesOfTypeWithAttribute<T, TAttribute>(specificAssemblies ?? AssembliesToScan),
                     cache);
             }
@@ -608,12 +649,12 @@ namespace Umbraco.Core
             // filter the cached discovered types (and cache the result)
 
             var discovered = ResolveTypesInternal(
-                typeof (IDiscoverable), null,
+                typeof(IDiscoverable), null,
                 () => TypeFinder.FindClassesOfType<IDiscoverable>(AssembliesToScan),
                 true);
 
             return ResolveTypesInternal(
-                typeof (T), typeof (TAttribute),
+                typeof(T), typeof(TAttribute),
                 () => discovered
                     .Where(x => typeof(T).IsAssignableFrom(x))
                     .Where(x => x.GetCustomAttributes<TAttribute>(false).Any()),
@@ -635,7 +676,7 @@ namespace Umbraco.Core
             cache &= specificAssemblies == null;
 
             return ResolveTypesInternal(
-                typeof (object), typeof (TAttribute),
+                typeof(object), typeof(TAttribute),
                 () => TypeFinder.FindClassesWithAttribute<TAttribute>(specificAssemblies ?? AssembliesToScan),
                 cache);
         }
@@ -653,13 +694,13 @@ namespace Umbraco.Core
             var name = ResolvedName(baseType, attributeType);
 
             lock (_typesLock)
-            using (_logger.TraceDuration<PluginManager>(
-                "Resolving " + name,
-                "Resolved " + name)) // cannot contain typesFound.Count as it's evaluated before the find
-            {
-                // resolve within a lock & timer
-                return ResolveTypesInternalLocked(baseType, attributeType, finder, cache);
-            }
+                using (_logger.TraceDuration<PluginManager>(
+                    "Resolving " + name,
+                    "Resolved " + name)) // cannot contain typesFound.Count as it's evaluated before the find
+                {
+                    // resolve within a lock & timer
+                    return ResolveTypesInternalLocked(baseType, attributeType, finder, cache);
+                }
         }
 
         private static string ResolvedName(Type baseType, Type attributeType)
@@ -691,7 +732,7 @@ namespace Umbraco.Core
             // else proceed,
             typeList = new TypeList(baseType, attributeType);
 
-            var scan = RequiresRescanning || File.Exists(GetPluginListFilePath()) == false;
+            var scan = RequiresRescanning || File.Exists(_pluginListFilePath.Value) == false;
 
             if (scan)
             {
@@ -795,7 +836,7 @@ namespace Umbraco.Core
 
             public TypeListKey(Type baseType, Type attributeType)
             {
-                BaseType = baseType ?? typeof (object);
+                BaseType = baseType ?? typeof(object);
                 AttributeType = attributeType;
             }
 
@@ -813,7 +854,7 @@ namespace Umbraco.Core
 
                 var hash = 5381;
                 hash = ((hash << 5) + hash) ^ BaseType.GetHashCode();
-                hash = ((hash << 5) + hash) ^ (AttributeType ?? typeof (TypeListKey)).GetHashCode();
+                hash = ((hash << 5) + hash) ^ (AttributeType ?? typeof(TypeListKey)).GetHashCode();
                 return hash;
             }
         }
@@ -876,7 +917,7 @@ namespace Umbraco.Core
         {
             // look for IParameterEditor (fast, IDiscoverable) then filter
 
-            var propertyEditor = typeof (PropertyEditor);
+            var propertyEditor = typeof(PropertyEditor);
 
             return mgr.ResolveTypes<IParameterEditor>()
                 .Where(x => propertyEditor.IsAssignableFrom(x) && x != propertyEditor);
@@ -891,8 +932,8 @@ namespace Umbraco.Core
         /// </remarks>
         public static IEnumerable<Type> ResolveParameterEditors(this PluginManager mgr)
         {
-            var propertyEditor = typeof (PropertyEditor);
-            var parameterEditor = typeof (ParameterEditor);
+            var propertyEditor = typeof(PropertyEditor);
+            var parameterEditor = typeof(ParameterEditor);
 
             return mgr.ResolveTypes<IParameterEditor>()
                 .Where(x => x != propertyEditor && x != parameterEditor);

src/Umbraco.Core/PropertyEditors/PreValueEditor.cs

@@ -178,29 +178,25 @@ namespace Umbraco.Core.PropertyEditors
             return result;
         }
 
-        private void ConvertItemsToJsonIfDetected(IDictionary<string, object> result)
+        protected void ConvertItemsToJsonIfDetected(IDictionary<string, object> result)
         {
-            //now we're going to try to see if any of the values are JSON, if they are we'll convert them to real JSON objects
-            // so they can be consumed as real json in angular!
+            // convert values that are Json to true Json objects that can be consumed by Angular
 
             var keys = result.Keys.ToArray();
             for (var i = 0; i < keys.Length; i++)
             {
-                if (result[keys[i]] is string)
+                if ((result[keys[i]] is string) == false) continue;
+
+                var asString = result[keys[i]].ToString();
+                if (asString.DetectIsJson() == false) continue;
+
+                try
                 {
-                    var asString = result[keys[i]].ToString();
-                    if (asString.DetectIsJson())
-                    {
-                        try
-                        {
-                            var json = JsonConvert.DeserializeObject(asString);
-                            result[keys[i]] = json;
-                        }
-                        catch
-                        {
-                            //swallow this exception, we thought it was json but it really isn't so continue returning a string
-                        }
-                    }
+                    result[keys[i]] = JsonConvert.DeserializeObject(asString);
+                }
+                catch
+                {
+                    // swallow this exception, we thought it was Json but it really isn't so continue returning a string
                 }
             }
         }

src/Umbraco.Core/PropertyEditors/ValueConverters/ColorPickerValueConverter.cs

@@ -1,13 +1,14 @@
 using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 
 namespace Umbraco.Core.PropertyEditors.ValueConverters
 {
     [DefaultPropertyValueConverter]
-    [PropertyValueType(typeof(string))]
-    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
-    public class ColorPickerValueConverter : PropertyValueConverterBase
+    public class ColorPickerValueConverter : PropertyValueConverterBase, IPropertyValueConverterMeta
     {
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
@@ -18,11 +19,60 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
 	        return false;
         }
 
+        public Type GetPropertyValueType(PublishedPropertyType propertyType)
+        {
+            return UseLabel(propertyType) ? typeof(PickedColor) : typeof(string);
+        }
+
+        public PropertyCacheLevel GetPropertyCacheLevel(PublishedPropertyType propertyType, PropertyCacheValue cacheValue)
+        {
+            return PropertyCacheLevel.Content;
+        }
+
+        private bool UseLabel(PublishedPropertyType propertyType)
+        {
+            var preValues = ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(propertyType.DataTypeId);
+            PreValue preValue;
+            return preValues.PreValuesAsDictionary.TryGetValue("useLabel", out preValue) && preValue.Value == "1";
+        }
+
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
-            // make sure it's a string
-            return source == null ? string.Empty : source.ToString();
+            var useLabel = UseLabel(propertyType);
+
+            if (source == null) return useLabel ? null : string.Empty;
+
+            var ssource = source.ToString();
+            if (ssource.DetectIsJson())
+            {
+                try
+                {
+                    var jo = JsonConvert.DeserializeObject<JObject>(ssource);
+                    if (useLabel) return new PickedColor(jo["value"].ToString(), jo["label"].ToString());
+                    return jo["value"].ToString();
+                }
+                catch { /* not json finally */ }
+            }
+
+            if (useLabel) return new PickedColor(ssource, ssource);
+            return ssource;
+        }
+
+        public class PickedColor
+        {
+            public PickedColor(string color, string label)
+            {
+                Color = color;
+                Label = label;
+            }
+
+            public string Color { get; private set; }
+            public string Label { get; private set; }
+
+            public override string ToString()
+            {
+                return Color;
+            }
         }
-        
     }
 }

src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs

@@ -43,8 +43,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                     var gridConfig = UmbracoConfig.For.GridConfig(
                         ApplicationContext.Current.ProfilingLogger.Logger,
                         ApplicationContext.Current.ApplicationCache.RuntimeCache,
-                        new DirectoryInfo(HttpContext.Current.Server.MapPath(SystemDirectories.AppPlugins)),
-                        new DirectoryInfo(HttpContext.Current.Server.MapPath(SystemDirectories.Config)),
+                        new DirectoryInfo(IOHelper.MapPath(SystemDirectories.AppPlugins)),
+                        new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Config)),
                         HttpContext.Current.IsDebuggingEnabled);
                     
                     var sections = GetArray(obj, "sections");

src/Umbraco.Core/Security/BackOfficeSignInManager.cs

@@ -12,6 +12,7 @@ using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Core.Security
 {
+    //TODO: In v8 we need to change this to use an int? nullable TKey instead, see notes against overridden TwoFactorSignInAsync
     public class BackOfficeSignInManager : SignInManager<BackOfficeIdentityUser, int>
     {
         private readonly ILogger _logger;
@@ -259,5 +260,67 @@ namespace Umbraco.Core.Security
             }
             return null;
         }
+
+        /// <summary>
+        /// Two factor verification step
+        /// </summary>
+        /// <param name="provider"></param>
+        /// <param name="code"></param>
+        /// <param name="isPersistent"></param>
+        /// <param name="rememberBrowser"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is implemented because we cannot override GetVerifiedUserIdAsync and instead we have to shadow it
+        /// so due to this and because we are using an INT as the TKey and not an object, it can never be null. Adding to that
+        /// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
+        /// all of this code to check for -1 instead.
+        /// </remarks>
+        public override async Task<SignInStatus> TwoFactorSignInAsync(string provider, string code, bool isPersistent, bool rememberBrowser)
+        {
+            var userId = await GetVerifiedUserIdAsync();
+            if (userId == -1)
+            {
+                return SignInStatus.Failure;
+            }
+            var user = await UserManager.FindByIdAsync(userId);
+            if (user == null)
+            {
+                return SignInStatus.Failure;
+            }
+            if (await UserManager.IsLockedOutAsync(user.Id))
+            {
+                return SignInStatus.LockedOut;
+            }
+            if (await UserManager.VerifyTwoFactorTokenAsync(user.Id, provider, code))
+            {
+                // When token is verified correctly, clear the access failed count used for lockout
+                await UserManager.ResetAccessFailedCountAsync(user.Id);
+                await SignInAsync(user, isPersistent, rememberBrowser);
+                return SignInStatus.Success;
+            }
+            // If the token is incorrect, record the failure which also may cause the user to be locked out
+            await UserManager.AccessFailedAsync(user.Id);
+            return SignInStatus.Failure;
+        }
+
+        /// <summary>Send a two factor code to a user</summary>
+        /// <param name="provider"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is implemented because we cannot override GetVerifiedUserIdAsync and instead we have to shadow it
+        /// so due to this and because we are using an INT as the TKey and not an object, it can never be null. Adding to that
+        /// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
+        /// all of this code to check for -1 instead.
+        /// </remarks>
+        public override async Task<bool> SendTwoFactorCodeAsync(string provider)
+        {
+            var userId = await GetVerifiedUserIdAsync();
+            if (userId == -1)
+                return false;
+
+            var token = await UserManager.GenerateTwoFactorTokenAsync(userId, provider);
+            var identityResult = await UserManager.NotifyTwoFactorTokenAsync(userId, provider, token);
+            return identityResult.Succeeded;
+        }
     }
 }

src/Umbraco.Core/Security/BackOfficeUserStore.cs

@@ -124,12 +124,15 @@ namespace Umbraco.Core.Security
             var found = _userService.GetUserById(asInt.Result);
             if (found != null)
             {
+                // we have to remember whether Logins property is dirty, since the UpdateMemberProperties will reset it.
+                var isLoginsPropertyDirty = user.IsPropertyDirty("Logins");
+
                 if (UpdateMemberProperties(found, user))
                 {
                     _userService.Save(found);
                 }
 
-                if (user.IsPropertyDirty("Logins"))
+                if (isLoginsPropertyDirty)
                 {
                     var logins = await GetLoginsAsync(user);
                     _externalLoginService.SaveUserLogins(found.Id, logins);

src/Umbraco.Core/Security/MembershipProviderBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Specialized;
+using System.ComponentModel.DataAnnotations;
 using System.Configuration.Provider;
 using System.Security.Cryptography;
 using System.Text;
@@ -8,6 +9,7 @@ using System.Web;
 using System.Web.Configuration;
 using System.Web.Hosting;
 using System.Web.Security;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 
@@ -677,11 +679,7 @@ namespace Umbraco.Core.Security
 
         internal static bool IsEmailValid(string email)
         {
-            const string pattern = @"^(?!\.)(""([^""\r\\]|\\[""\r\\])*""|"
-                                   + @"([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
-                                   + @"@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$";
-
-            return Regex.IsMatch(email, pattern, RegexOptions.IgnoreCase | RegexOptions.Compiled);
+            return new EmailAddressAttribute().IsValid(email);
         }
 
         protected internal string EncryptOrHashPassword(string pass, string salt)

src/Umbraco.Core/Services/ContentService.cs

@@ -62,7 +62,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateContentRepository(uow);
-                return repository.CountPublished();
+                return repository.CountPublished(contentTypeAlias);
             }
         }
 
@@ -2006,6 +2006,96 @@ namespace Umbraco.Core.Services
                 }
             }
 
+            return true;
+        }
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
+                var items = ids.Select(x => allContent[x]);
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in asArray)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
+                    uow.Commit();
+                }
+            }
+
             return true;
         }
 

src/Umbraco.Core/Services/EntityXmlSerializer.cs

@@ -42,6 +42,7 @@ namespace Umbraco.Core.Services
             xml.Add(new XAttribute("writerID", content.WriterId));
             xml.Add(new XAttribute("template", content.Template == null ? "0" : content.Template.Id.ToString(CultureInfo.InvariantCulture)));
             xml.Add(new XAttribute("nodeTypeAlias", content.ContentType.Alias));
+            xml.Add(new XAttribute("isPublished", content.Published));
 
             if (deep)
             {

src/Umbraco.Core/Services/IContentService.cs

@@ -642,7 +642,21 @@ namespace Umbraco.Core.Services
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        bool Sort(int[] ids, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
         /// Gets the parent of the current content as an <see cref="IContent"/> item.

src/Umbraco.Core/Services/IdkMap.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Services
     {
         private readonly IDatabaseUnitOfWorkProvider _uowProvider;
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
-        
+
         private readonly Dictionary<int, TypedId<Guid>> _id2Key = new Dictionary<int, TypedId<Guid>>();
         private readonly Dictionary<Guid, TypedId<int>> _key2Id = new Dictionary<Guid, TypedId<int>>();
 
@@ -39,8 +39,8 @@ namespace Umbraco.Core.Services
             int? val;
             using (var uow = _uowProvider.GetUnitOfWork())
             {
-                val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id AND nodeObjectType=@nodeObjectType",
-                    new { id = key, nodeObjectType = GetNodeObjectTypeGuid(umbracoObjectType) });
+                val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
+                    new { id = key, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
                 uow.Commit();
             }
 
@@ -92,8 +92,8 @@ namespace Umbraco.Core.Services
             Guid? val;
             using (var uow = _uowProvider.GetUnitOfWork())
             {
-                val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id AND nodeObjectType=@nodeObjectType",
-                    new { id, nodeObjectType = GetNodeObjectTypeGuid(umbracoObjectType) });
+                val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
+                    new { id, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
                 uow.Commit();
             }
 
@@ -106,8 +106,8 @@ namespace Umbraco.Core.Services
             try
             {
                 _locker.EnterWriteLock();
-                _id2Key[id] = new TypedId<Guid>(val.Value, umbracoObjectType); ;
-                _key2Id[val.Value] = new TypedId<int>();
+                _id2Key[id] = new TypedId<Guid>(val.Value, umbracoObjectType);
+                _key2Id[val.Value] = new TypedId<int>(id, umbracoObjectType);
             }
             finally
             {
@@ -179,7 +179,7 @@ namespace Umbraco.Core.Services
         {
             private readonly T _id;
             private readonly UmbracoObjectTypes _umbracoObjectType;
-            
+
             public T Id
             {
                 get { return _id; }

src/Umbraco.Core/Services/MemberService.cs

@@ -986,7 +986,11 @@ namespace Umbraco.Core.Services
         /// <param name="raiseEvents">Optional parameter to raise events.
         /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
         public void Save(IMember entity, bool raiseEvents = true)
-        {
+        {
+            //trimming username and email to make sure we have no trailing space
+            entity.Username = entity.Username.Trim();
+            entity.Email = entity.Email.Trim();
+
             using (var uow = UowProvider.GetUnitOfWork())
             {
                 var saveEventArgs = new SaveEventArgs<IMember>(entity);

src/Umbraco.Core/Sync/DatabaseServerMessenger.cs

@@ -14,6 +14,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using umbraco.interfaces;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Sync
@@ -39,6 +40,7 @@ namespace Umbraco.Core.Sync
         private bool _syncing;
         private bool _released;
         private readonly ProfilingLogger _profilingLogger;
+        private readonly Lazy<string> _distCacheFilePath = new Lazy<string>(GetDistCacheFilePath);
 
         protected DatabaseServerMessengerOptions Options { get; private set; }
         protected ApplicationContext ApplicationContext { get { return _appContext; } }
@@ -460,10 +462,9 @@ namespace Umbraco.Core.Sync
         /// </remarks>
         private void ReadLastSynced()
         {
-            var path = SyncFilePath;
-            if (File.Exists(path) == false) return;
+            if (File.Exists(_distCacheFilePath.Value) == false) return;
 
-            var content = File.ReadAllText(path);
+            var content = File.ReadAllText(_distCacheFilePath.Value);
             int last;
             if (int.TryParse(content, out last))
                 _lastId = last;
@@ -478,7 +479,7 @@ namespace Umbraco.Core.Sync
         /// </remarks>
         private void SaveLastSynced(int id)
         {
-            File.WriteAllText(SyncFilePath, id.ToString(CultureInfo.InvariantCulture));
+            File.WriteAllText(_distCacheFilePath.Value, id.ToString(CultureInfo.InvariantCulture));
             _lastId = id;
         }
 
@@ -498,20 +499,40 @@ namespace Umbraco.Core.Sync
             + "/D" + AppDomain.CurrentDomain.Id // eg 22
             + "] " + Guid.NewGuid().ToString("N").ToUpper(); // make it truly unique
 
-        /// <summary>
-        /// Gets the sync file path for the local server.
-        /// </summary>
-        /// <returns>The sync file path for the local server.</returns>
-        private static string SyncFilePath
+        private static string GetDistCacheFilePath()
         {
-            get
-            {
-                var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/DistCache/" + NetworkHelper.FileSafeMachineName);
-                if (Directory.Exists(tempFolder) == false)
-                    Directory.CreateDirectory(tempFolder);
+            var fileName = HttpRuntime.AppDomainAppId.ReplaceNonAlphanumericChars(string.Empty) + "-lastsynced.txt";
 
-                return Path.Combine(tempFolder, HttpRuntime.AppDomainAppId.ReplaceNonAlphanumericChars(string.Empty) + "-lastsynced.txt");
+            string distCacheFilePath;
+            switch (GlobalSettings.LocalTempStorageLocation)
+            {
+                case LocalTempStorage.AspNetTemp:
+                    distCacheFilePath = Path.Combine(HttpRuntime.CodegenDir, @"UmbracoData", fileName);
+                    break;
+                case LocalTempStorage.EnvironmentTemp:
+                    var appDomainHash = HttpRuntime.AppDomainAppId.ToSHA1();
+                    var cachePath = Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "UmbracoData",
+                        //include the appdomain hash is just a safety check, for example if a website is moved from worker A to worker B and then back
+                        // to worker A again, in theory the %temp%  folder should already be empty but we really want to make sure that its not
+                        // utilizing an old path
+                        appDomainHash);
+                    distCacheFilePath = Path.Combine(cachePath, fileName);
+                    break;
+                case LocalTempStorage.Default:
+                default:
+                    var tempFolder = IOHelper.MapPath("~/App_Data/TEMP/DistCache");
+                    distCacheFilePath = Path.Combine(tempFolder, fileName);
+                    break;
             }
+
+            //ensure the folder exists
+            var folder = Path.GetDirectoryName(distCacheFilePath);
+            if (folder == null)
+                throw new InvalidOperationException("The folder could not be determined for the file " + distCacheFilePath);
+            if (Directory.Exists(folder) == false)
+                Directory.CreateDirectory(folder);
+
+            return distCacheFilePath;
         }
 
         #endregion

src/Umbraco.Core/TypeFinder.cs

@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Security;
 using System.Text;
-using System.Web;
 using System.Web.Compilation;
-using System.Web.Hosting;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
@@ -21,6 +20,38 @@ namespace Umbraco.Core
     {
         private static volatile HashSet<Assembly> _localFilteredAssemblyCache;
         private static readonly object LocalFilteredAssemblyCacheLocker = new object();
+        private static readonly List<string> NotifiedLoadExceptionAssemblies = new List<string>();
+        private static string[] _assembliesAcceptingLoadExceptions;
+
+        private static string[] AssembliesAcceptingLoadExceptions
+        {
+            get
+            {
+                if (_assembliesAcceptingLoadExceptions != null)
+                    return _assembliesAcceptingLoadExceptions;
+
+                var s = ConfigurationManager.AppSettings["Umbraco.AssembliesAcceptingLoadExceptions"];
+                return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
+                    ? new string[0]
+                    : s.Split(',').Select(x => x.Trim()).ToArray();
+            }
+        }
+
+        private static bool AcceptsLoadExceptions(Assembly a)
+        {
+            if (AssembliesAcceptingLoadExceptions.Length == 0)
+                return false;
+            if (AssembliesAcceptingLoadExceptions.Length == 1 && AssembliesAcceptingLoadExceptions[0] == "*")
+                return true;
+            var name = a.GetName().Name; // simple name of the assembly
+            return AssembliesAcceptingLoadExceptions.Any(pattern =>
+            {
+                if (pattern.Length > name.Length) return false; // pattern longer than name
+                if (pattern.Length == name.Length) return pattern.InvariantEquals(name); // same length, must be identical
+                if (pattern[pattern.Length] != '.') return false; // pattern is shorter than name, must end with dot
+                return name.StartsWith(pattern); // and name must start with pattern
+            });
+        }
 
         /// <summary>
         /// lazily load a reference to all assemblies and only local assemblies.
@@ -45,7 +76,7 @@ namespace Umbraco.Core
             HashSet<Assembly> assemblies = null;
             try
             {
-                var isHosted = HttpContext.Current != null || HostingEnvironment.IsHosted;
+                var isHosted = IOHelper.IsHosted;
 
                 try
                 {
@@ -528,9 +559,22 @@ namespace Umbraco.Core
                 AppendCouldNotLoad(sb, a, getAll);
                 foreach (var loaderException in rex.LoaderExceptions.WhereNotNull())
                     AppendLoaderException(sb, loaderException);
+
+                var ex = new ReflectionTypeLoadException(rex.Types, rex.LoaderExceptions, sb.ToString());
 
-                // rethrow with new message
-                throw new ReflectionTypeLoadException(rex.Types, rex.LoaderExceptions, sb.ToString());
+                // rethrow with new message, unless accepted
+                if (AcceptsLoadExceptions(a) == false) throw ex;
+
+                // log a warning, and return what we can
+                lock (NotifiedLoadExceptionAssemblies)
+                {
+                    if (NotifiedLoadExceptionAssemblies.Contains(a.FullName) == false)
+                    {
+                        NotifiedLoadExceptionAssemblies.Add(a.FullName);
+                        LogHelper.WarnWithException(typeof(TypeFinder), "Could not load all types from " + a.GetName().Name + ".", ex);
+                    }
+                }
+                return rex.Types.WhereNotNull().ToArray();
             }
         }
 

src/Umbraco.Core/UdiEntityType.cs

@@ -117,6 +117,8 @@ namespace Umbraco.Core
                 {
                     case UmbracoObjectTypes.Document:
                         return Document;
+                    case UmbracoObjectTypes.DocumentBlueprint:
+                        return DocumentBluePrint;
                     case UmbracoObjectTypes.Media:
                         return Media;
                     case UmbracoObjectTypes.Member:
@@ -161,6 +163,8 @@ namespace Umbraco.Core
                 {
                     case Document:
                         return UmbracoObjectTypes.Document;
+                    case DocumentBluePrint:
+                        return UmbracoObjectTypes.DocumentBlueprint;
                     case Media:
                         return UmbracoObjectTypes.Media;
                     case Member:

src/Umbraco.Core/Umbraco.Core.csproj

@@ -56,8 +56,8 @@
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ImageProcessor, Version=2.5.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.5.3\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
     </Reference>
     <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>
@@ -198,7 +198,7 @@
     <Compile Include="Configuration\BaseRest\ExtensionElement.cs" />
     <Compile Include="Configuration\BaseRest\ExtensionElementCollection.cs" />
     <Compile Include="Configuration\BaseRest\MethodElement.cs" />
-    <Compile Include="Configuration\ContentXmlStorage.cs" />
+    <Compile Include="Configuration\LocalTempStorage.cs" />
     <Compile Include="Configuration\CoreDebug.cs" />
     <Compile Include="Configuration\Dashboard\AccessElement.cs" />
     <Compile Include="Configuration\Dashboard\AccessItem.cs" />
@@ -366,6 +366,7 @@
     <Compile Include="HashGenerator.cs" />
     <Compile Include="IEmailSender.cs" />
     <Compile Include="IHttpContextAccessor.cs" />
+    <Compile Include="Logging\RollingFileCleanupAppender.cs" />
     <Compile Include="Models\EntityBase\EntityPath.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
     <Compile Include="Models\IUserControl.cs" />

src/Umbraco.Core/packages.config

@@ -3,7 +3,7 @@
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.5.3" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />

src/Umbraco.Tests/Models/ContentTests.cs

@@ -20,7 +20,7 @@ using Umbraco.Tests.TestHelpers.Entities;
 namespace Umbraco.Tests.Models
 {
     [TestFixture]
-    public class ContentTests : BaseUmbracoConfigurationTest
+    public class ContentTests : BaseUmbracoApplicationTest
     {
         [SetUp]
         public void Init()

src/Umbraco.Tests/Services/EntityServiceTests.cs

@@ -26,15 +26,15 @@ namespace Umbraco.Tests.Services
         public override void TearDown()
         {
             base.TearDown();
-        }      
+        }
 
         [Test]
         public void EntityService_Can_Get_Paged_Content_Children()
         {
-            
+
             var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
-            
-            var root = MockedContent.CreateSimpleContent(contentType);            
+
+            var root = MockedContent.CreateSimpleContent(contentType);
             ServiceContext.ContentService.Save(root);
             for (int i = 0; i < 10; i++)
             {
@@ -45,7 +45,7 @@ namespace Umbraco.Tests.Services
             var service = ServiceContext.EntityService;
 
             long total;
-            var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out total).ToArray();            
+            var entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(6));
             Assert.That(total, Is.EqualTo(10));
             entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
@@ -72,7 +72,7 @@ namespace Umbraco.Tests.Services
                     var c2 = MockedContent.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
                     ServiceContext.ContentService.Save(c2);
                     count++;
-                }                
+                }
             }
 
             var service = ServiceContext.EntityService;
@@ -181,7 +181,7 @@ namespace Umbraco.Tests.Services
 
             var root = MockedContent.CreateSimpleContent(contentType);
             ServiceContext.ContentService.Save(root);
-            
+
             for (int i = 0; i < 10; i++)
             {
                 var c1 = MockedContent.CreateSimpleContent(contentType, "ssss" + Guid.NewGuid(), root);
@@ -204,7 +204,7 @@ namespace Umbraco.Tests.Services
             Assert.That(entities.Length, Is.EqualTo(50));
             Assert.That(total, Is.EqualTo(50));
         }
-       
+
         [Test]
         public void EntityService_Can_Get_Paged_Media_Children()
         {
@@ -227,7 +227,7 @@ namespace Umbraco.Tests.Services
             Assert.That(total, Is.EqualTo(10));
             entities = service.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 1, 6, out total).ToArray();
             Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));            
+            Assert.That(total, Is.EqualTo(10));
         }
 
         [Test]
@@ -362,7 +362,7 @@ namespace Umbraco.Tests.Services
 
             var root = MockedMedia.CreateMediaFolder(folderType, -1);
             ServiceContext.MediaService.Save(root);
-            
+
             for (int i = 0; i < 10; i++)
             {
                 var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id);
@@ -519,7 +519,7 @@ namespace Umbraco.Tests.Services
             Assert.That(
                 entities.Any(
                     x =>
-                    x.AdditionalData.Any(y => y.Value is UmbracoEntity.EntityProperty 
+                    x.AdditionalData.Any(y => y.Value is UmbracoEntity.EntityProperty
                         && ((UmbracoEntity.EntityProperty)y.Value).PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias)), Is.True);
         }
 
@@ -575,6 +575,30 @@ namespace Umbraco.Tests.Services
             Assert.IsFalse(result2.Success);
         }
 
+        [Test]
+        public void ReserveId()
+        {
+            var service = ServiceContext.EntityService;
+            var guid = Guid.NewGuid();
+
+            // can reserve
+            var reservedId = service.ReserveId(guid);
+            Assert.IsTrue(reservedId > 0);
+
+            // can get it back
+            var id = service.GetIdForKey(guid, UmbracoObjectTypes.DocumentType);
+            Assert.IsTrue(id.Success);
+            Assert.AreEqual(reservedId, id.Result);
+
+            // anything goes
+            id = service.GetIdForKey(guid, UmbracoObjectTypes.Media);
+            Assert.IsTrue(id.Success);
+            Assert.AreEqual(reservedId, id.Result);
+
+            // a random guid won't work
+            Assert.IsFalse(service.GetIdForKey(Guid.NewGuid(), UmbracoObjectTypes.DocumentType).Success);
+        }
+
         private static bool _isSetup = false;
 
         private int folderId;
@@ -589,7 +613,7 @@ namespace Umbraco.Tests.Services
 
                 //Create and Save folder-Media -> 1050
                 var folderMediaType = ServiceContext.ContentTypeService.GetMediaType(1031);
-                var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);                
+                var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1);
                 ServiceContext.MediaService.Save(folder, 0);
                 folderId = folder.Id;
 
@@ -607,9 +631,9 @@ namespace Umbraco.Tests.Services
                 ServiceContext.MediaService.Save(subfolder, 0);
                 var subfolder2 = MockedMedia.CreateMediaFolder(folderMediaType, subfolder.Id);
                 ServiceContext.MediaService.Save(subfolder2, 0);
-                
+
             }
-            
+
         }
     }
 }

src/Umbraco.Tests/Strings/StringValidationTests.cs

@@ -17,6 +17,8 @@ namespace Umbraco.Tests.Strings
             Assert.IsTrue(foo.IsValid("futureTLD@somewhere.fooo"));
 
             Assert.IsTrue(foo.IsValid("abc@xyz.financial"));
+            Assert.IsTrue(foo.IsValid("admin+gmail-syntax@c.pizza"));
+            Assert.IsTrue(foo.IsValid("admin@c.pizza"));
 
             Assert.IsFalse(foo.IsValid("fdsa"));
             Assert.IsFalse(foo.IsValid("fdsa@"));

src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs

@@ -388,13 +388,12 @@ namespace Umbraco.Tests.TestHelpers
             return ctx;
         }
 
-        protected FakeHttpContextFactory GetHttpContextFactory(string url, RouteData routeData = null)
+        protected virtual FakeHttpContextFactory GetHttpContextFactory(string url, RouteData routeData = null)
         {
             var factory = routeData != null
                             ? new FakeHttpContextFactory(url, routeData)
                             : new FakeHttpContextFactory(url);
 
-
             //set the state helper
             StateHelper.HttpContext = factory.HttpContext;
 

src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs

@@ -118,26 +118,13 @@ namespace Umbraco.Tests.TestHelpers
             });            
         }
 
-        /// <summary>
-        /// By default this returns false which means the plugin manager will not be reset so it doesn't need to re-scan
-        /// all of the assemblies. Inheritors can override this if plugin manager resetting is required, generally needs
-        /// to be set to true if the SetupPluginManager has been overridden.
-        /// </summary>
-        protected virtual bool PluginManagerResetRequired
-        {
-            get { return false; }
-        }
-
         /// <summary>
         /// Inheritors can resset the plugin manager if they choose to on teardown
         /// </summary>
         protected virtual void ResetPluginManager()
         {
-            if (PluginManagerResetRequired)
-            {
-                PluginManager.Current = null;
-            }
-        }        
+            PluginManager.Current = null;
+        }
 
         protected virtual CacheHelper CreateCacheHelper()
         {
@@ -185,26 +172,23 @@ namespace Umbraco.Tests.TestHelpers
         /// </summary>
         protected virtual void SetupPluginManager()
         {
-            if (PluginManager.Current == null || PluginManagerResetRequired)
+            PluginManager.Current = new PluginManager(
+                new ActivatorServiceProvider(),
+                CacheHelper.RuntimeCache, ProfilingLogger, false)
             {
-                PluginManager.Current = new PluginManager(
-                    new ActivatorServiceProvider(),
-                    CacheHelper.RuntimeCache, ProfilingLogger, false)
+                AssembliesToScan = new[]
                 {
-                    AssembliesToScan = new[]
-                    {
-                        Assembly.Load("Umbraco.Core"),
-                        Assembly.Load("umbraco"),
-                        Assembly.Load("Umbraco.Tests"),
-                        Assembly.Load("businesslogic"),
-                        Assembly.Load("cms"),
-                        Assembly.Load("controls"),
-                        Assembly.Load("umbraco.editorControls"),
-                        Assembly.Load("umbraco.MacroEngines"),
-                        Assembly.Load("umbraco.providers"),
-                    }
-                };
-            }
+                    Assembly.Load("Umbraco.Core"),
+                    Assembly.Load("umbraco"),
+                    Assembly.Load("Umbraco.Tests"),
+                    Assembly.Load("businesslogic"),
+                    Assembly.Load("cms"),
+                    Assembly.Load("controls"),
+                    Assembly.Load("umbraco.editorControls"),
+                    Assembly.Load("umbraco.MacroEngines"),
+                    Assembly.Load("umbraco.providers"),
+                }
+            };
         }
 
         /// <summary>

src/Umbraco.Tests/UdiTests.cs

@@ -7,12 +7,19 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Deploy;
 using Umbraco.Core.Serialization;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests
 {
     [TestFixture]
-    public class UdiTests
+    public class UdiTests : BaseUmbracoApplicationTest
     {
+        [SetUp]
+        public void Setup()
+        {
+            Udi.ResetUdiTypes();
+        }
+
         [Test]
         public void StringUdiCtorTest()
         {

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -62,8 +62,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=0.1.85.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.0.1.85\lib\net45\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=0.1.88.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.0.1.88\lib\net45\Examine.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>

src/Umbraco.Tests/Web/Mvc/HtmlStringUtilitiesTests.cs

@@ -22,5 +22,40 @@ namespace Umbraco.Tests.Web.Mvc
             var expected = "<div><h1>hello world</h1><p>hello world<br />hello world<br />hello world<br />hello world</p></div>";
             Assert.AreEqual(expected, output);
         }
+
+        [Test]
+        public void TruncateWithElipsis()
+        {
+            var output = _htmlStringUtilities.Truncate("hello world", 5, true, false).ToString();
+            var expected = "hello&hellip;";
+            Assert.AreEqual(expected, output);
+        }
+
+        [Test]
+        public void TruncateWithoutElipsis()
+        {
+            var output = _htmlStringUtilities.Truncate("hello world", 5, false, false).ToString();
+            var expected = "hello";
+            Assert.AreEqual(expected, output);
+        }
+
+        [Test]
+        public void TruncateShorterWordThanHellip()
+        {
+            //http://issues.umbraco.org/issue/U4-10478
+            var output = _htmlStringUtilities.Truncate("hi", 5, true, false).ToString();
+            var expected = "hi";
+            Assert.AreEqual(expected, output);
+        }
+
+        [Test]
+        public void TruncateAndRemoveSpaceBetweenHellipAndWord()
+        {
+            var output = _htmlStringUtilities.Truncate("hello world", 6 /* hello plus space */, true, false).ToString();
+            var expected = "hello&hellip;";
+            Assert.AreEqual(expected, output);
+        }
+
+
     }
 }

src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs

@@ -20,8 +20,14 @@ using Umbraco.Web.Templates;
 namespace Umbraco.Tests.Web
 {
     [TestFixture]
-    public class TemplateUtilitiesTests
+    public class TemplateUtilitiesTests : BaseUmbracoApplicationTest
     {
+        [SetUp]
+        public void Setup()
+        {
+            Udi.ResetUdiTypes();
+        }
+
         [TestCase("", "")]
         [TestCase("hello href=\"{localLink:1234}\" world ", "hello href=\"/my-test-url\" world ")]
         [TestCase("hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"/my-test-url\" world ")]

src/Umbraco.Tests/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
   <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
-  <package id="Examine" version="0.1.85" targetFramework="net45" />
+  <package id="Examine" version="0.1.88" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="Log4Net.Async" version="2.0.4" targetFramework="net45" />
   <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />

src/Umbraco.Web.UI.Client/lib/bootstrap/less/thumbnails.less

@@ -31,15 +31,17 @@
   display: block;
   padding: 4px;
   line-height: @baseLineHeight;
-  border: 1px solid #ddd;
+  border: 1px solid @gray-8;
   .border-radius(@baseBorderRadius);
   .box-shadow(0 1px 3px rgba(0,0,0,.055));
   .transition(all .2s ease-in-out);
 }
-// Add a hover/focus state for linked versions only
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: @linkColor;
+// Add a hover/focus state for linked versions only.
+a.thumbnail:hover, 
+a.thumbnail:focus,
+a div.thumbnail:hover,
+a div.thumbnail:focus {
+  border-color: @turquoise;
   .box-shadow(0 1px 4px rgba(0,105,214,.25));
 }
 

src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js

@@ -361,11 +361,29 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
             rootScope : function(){
                 return getRootScope();
             },
-
-            reloadLocation: function() {
-                var injector = getRootInjector();
-                var $route = injector.get("$route");
-                $route.reload();
+
+            /**
+            This will reload the content frame based on it's current route, if pathToMatch is specified it will only reload it if the current
+            location matches the path
+            */
+            reloadLocation: function(pathToMatch) {
+
+                var injector = getRootInjector();
+                var doChange = true;
+                if (pathToMatch) {
+                    var $location = injector.get("$location");
+                    var path = $location.path();
+                    if (path != pathToMatch) {
+                        doChange = false;
+                    }
+                }
+
+                if (doChange) {
+                    var $route = injector.get("$route");
+                    $route.reload();
+                    var $rootScope = injector.get("$rootScope");
+                    $rootScope.$apply();
+                }
             },
             
             closeModalWindow: function(rVal) {

src/Umbraco.Web.UI.Client/src/canvasdesigner/canvasdesigner.controller.js

@@ -7,12 +7,22 @@ var app = angular.module("Umbraco.canvasdesigner", ['colorpicker', 'ui.slider',
 
 .controller("Umbraco.canvasdesignerController", function ($scope, $http, $window, $timeout, $location, dialogService) {
 
+    var isInit = $location.search().init;
+    if (isInit === "true") {
+        //do not continue, this is the first load of this new window, if this is passed in it means it's been
+        //initialized by the content editor and then the content editor will actually re-load this window without
+        //this flag. This is a required trick to get around chrome popup mgr. We don't want to double load preview.aspx
+        //since that will double prepare the preview documents
+        return;
+    }
+
     $scope.isOpen = false;
     $scope.frameLoaded = false;
     $scope.enableCanvasdesigner = 0;
     $scope.googleFontFamilies = {};
-    $scope.pageId = $location.search().id;
-    $scope.pageUrl = "../dialogs/Preview.aspx?id=" + $location.search().id;
+    var pageId = $location.search().id;    
+    $scope.pageId = pageId;
+    $scope.pageUrl = "../dialogs/Preview.aspx?id=" + pageId;
     $scope.valueAreLoaded = false;
     $scope.devices = [
         { name: "desktop", css: "desktop", icon: "icon-display", title: "Desktop" },

src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js

@@ -3,7 +3,7 @@
 * @name umbraco.directives.directive:umbSections
 * @restrict E
 **/
-function sectionsDirective($timeout, $window, navigationService, treeService, sectionService, appState, eventsService, $location) {
+function sectionsDirective($timeout, $window, navigationService, treeService, sectionService, appState, eventsService, $location, historyService) {
     return {
         restrict: "E",    // restrict to an element
         replace: true,   // replace the html element with the template
@@ -161,7 +161,9 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
                     $location.path(section.routePath);
                 }
                 else {
-                    $location.path(section.alias).search('');
+                    var lastAccessed = historyService.getLastAccessedItemForSection(section.alias);
+                    var path = lastAccessed != null ? lastAccessed.link : section.alias;                  
+                    $location.path(path).search('');
                 }
 			    
 			};

src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js

@@ -208,9 +208,9 @@
       if (!$scope.busy) {
 
         // Chromes popup blocker will kick in if a window is opened 
-        // outwith the initial scoped request. This trick will fix that.
+        // without the initial scoped request. This trick will fix that.
         //  
-        var previewWindow = $window.open('preview/?id=' + content.id, 'umbpreview');
+        var previewWindow = $window.open('preview/?init=true&id=' + content.id, 'umbpreview');
 
         // Build the correct path so both /#/ and #/ work.
         var redirect = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + '/preview/?id=' + content.id;

src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js

@@ -36,7 +36,7 @@ angular.module("umbraco.directives")
         // this will greatly improve performance since there's potentially a lot of nodes being rendered = a LOT of watches!
 
         template: '<li ng-class="{\'current\': (node == currentNode), \'has-children\': node.hasChildren}" on-right-click="altSelect(node, $event)">' +
-            '<div ng-class="getNodeCssClass(node)" ng-swipe-right="options(node, $event)" >' +
+            '<div ng-class="getNodeCssClass(node)" ng-swipe-right="options(node, $event)" ng-dblclick="load(node)" >' +
             //NOTE: This ins element is used to display the search icon if the node is a container/listview and the tree is currently in dialog
             //'<ins ng-if="tree.enablelistviewsearch && node.metaData.isContainer" class="umb-tree-node-search icon-search" ng-click="searchNode(node, $event)" alt="searchAltText"></ins>' + 
             '<ins ng-class="{\'icon-navigation-right\': !node.expanded || node.metaData.isContainer, \'icon-navigation-down\': node.expanded && !node.metaData.isContainer}" ng-click="load(node)">&nbsp;</ins>' +

src/Umbraco.Web.UI.Client/src/common/directives/components/umbavatar.directive.js

@@ -66,9 +66,13 @@ Use this directive to render an avatar.
 
             function getNameInitials(name) {
                 if(name) {
-                    var initials = name.match(/\b\w/g) || [];
-                    initials = ((initials.shift() || '') + (initials.pop() || '')).toUpperCase();
-                    return initials;
+                    var names = name.split(' '),
+                        initials = names[0].substring(0, 1);
+
+                    if (names.length > 1) {
+                        initials += names[names.length - 1].substring(0, 1);
+                    }
+                    return initials.toUpperCase();
                 }
                 return null;
             }

src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js

@@ -110,7 +110,7 @@ Use this directive to generate a thumbnail grid of media items.
                     itemMinWidth = scope.itemMinWidth;
                 }
 
-                if (scope.itemMinWidth) {
+                if (scope.itemMinHeight) {
                     itemMinHeight = scope.itemMinHeight;
                 }
 

src/Umbraco.Web.UI.Client/src/common/directives/components/umbpasswordtoggle.directive.js

@@ -0,0 +1,26 @@
+(function () {
+    'use strict';
+
+    // comes from https://codepen.io/jakob-e/pen/eNBQaP
+    // works fine with Angular 1.6.5 - alas not with 1.1.5 - binding issue
+
+    function PasswordToggleDirective($compile) {
+
+        var directive = {
+            restrict: 'A',
+            scope: {},
+            link: function(scope, elem, attrs) {
+                scope.tgl = function () { elem.attr("type", (elem.attr("type") === "text" ? "password" : "text")); }
+                var lnk = angular.element("<a data-ng-click=\"tgl()\">Toggle</a>");
+                $compile(lnk)(scope);
+                elem.wrap("<div class=\"password-toggle\"/>").after(lnk);
+            }
+        };
+
+        return directive;
+
+    }
+
+    angular.module('umbraco.directives').directive('umbPasswordToggle', PasswordToggleDirective);
+
+})();

src/Umbraco.Web.UI.Client/src/common/directives/validation/valemail.directive.js

@@ -47,8 +47,8 @@ function valEmail(valEmailExpression) {
 angular.module('umbraco.directives.validation')
     .directive("valEmail", valEmail)
     .factory('valEmailExpression', function () {
-        //NOTE: This is the fixed regex which is part of the newer angular
+        var emailRegex = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
         return {
-            EMAIL_REGEXP: /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i
+            EMAIL_REGEXP: emailRegex
         };
     });

src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js

@@ -41,7 +41,7 @@ function entityResource($q, $http, umbRequestHelper) {
             if (!value) {
                 return "";
             }
-
+            value = value.replace("#", "");
             return umbRequestHelper.resourcePromise(
                $http.get(
                    umbRequestHelper.getApiUrl(

src/Umbraco.Web.UI.Client/src/common/services/assets.service.js

@@ -2,12 +2,12 @@
  * @ngdoc service
  * @name umbraco.services.assetsService
  *
- * @requires $q 
+ * @requires $q
  * @requires angularHelper
- *  
+ *
  * @description
  * Promise-based utillity service to lazy-load client-side dependencies inside angular controllers.
- * 
+ *
  * ##usage
  * To use, simply inject the assetsService into any controller that needs it, and make
  * sure the umbraco.services module is accesible - which it should be by default.
@@ -18,7 +18,7 @@
  *                 //this code executes when the dependencies are done loading
  *          });
  *      });
- * </pre> 
+ * </pre>
  *
  * You can also load individual files, which gives you greater control over what attibutes are passed to the file, as well as timeout
  *
@@ -38,13 +38,14 @@
  *                 //loadcss cannot determine when the css is done loading, so this will trigger instantly
  *          });
  *      });
- * </pre>  
+ * </pre>
  */
 angular.module('umbraco.services')
 .factory('assetsService', function ($q, $log, angularHelper, umbRequestHelper, $rootScope, $http) {
 
     var initAssetsLoaded = false;
-    var appendRnd = function (url) {
+
+    function appendRnd (url) {
         //if we don't have a global umbraco obj yet, the app is bootstrapping
         if (!Umbraco.Sys.ServerVariables.application) {
             return url;
@@ -77,7 +78,8 @@ angular.module('umbraco.services')
                 return this.loadedAssets[path];
             }
         },
-        /** 
+
+        /**
             Internal method. This is called when the application is loading and the user is already authenticated, or once the user is authenticated.
             There's a few assets the need to be loaded for the application to function but these assets require authentication to load.
         */
@@ -108,10 +110,10 @@ angular.module('umbraco.services')
          *
          * @description
          * Injects a file as a stylesheet into the document head
-         * 
+         *
          * @param {String} path path to the css file to load
          * @param {Scope} scope optional scope to pass into the loader
-         * @param {Object} keyvalue collection of attributes to pass to the stylesheet element  
+         * @param {Object} keyvalue collection of attributes to pass to the stylesheet element
          * @param {Number} timeout in milliseconds
          * @returns {Promise} Promise object which resolves when the file has loaded
          */
@@ -149,10 +151,10 @@ angular.module('umbraco.services')
          *
          * @description
          * Injects a file as a javascript into the document
-         * 
+         *
          * @param {String} path path to the js file to load
          * @param {Scope} scope optional scope to pass into the loader
-         * @param {Object} keyvalue collection of attributes to pass to the script element  
+         * @param {Object} keyvalue collection of attributes to pass to the script element
          * @param {Number} timeout in milliseconds
          * @returns {Promise} Promise object which resolves when the file has loaded
          */
@@ -192,8 +194,8 @@ angular.module('umbraco.services')
          * @methodOf umbraco.services.assetsService
          *
          * @description
-         * Injects a collection of files, this can be ONLY js files
-         * 
+         * Injects a collection of css and js files
+         *
          *
          * @param {Array} pathArray string array of paths to the files to load
          * @param {Scope} scope optional scope to pass into the loader
@@ -206,61 +208,72 @@ angular.module('umbraco.services')
                 throw "pathArray must be an array";
             }
 
+            // Check to see if there's anything to load, resolve promise if not
             var nonEmpty = _.reject(pathArray, function (item) {
                 return item === undefined || item === "";
-            });
+            });
 
-
-            //don't load anything if there's nothing to load
-            if (nonEmpty.length > 0) {
-                var promises = [];
-                var assets = [];
-
-                //compile a list of promises
-                //blocking
-                _.each(nonEmpty, function (path) {
-
-                    path = convertVirtualPath(path);
-
-                    var asset = service._getAssetPromise(path);
-                    //if not previously loaded, add to list of promises
-                    if (asset.state !== "loaded") {
-                        if (asset.state === "new") {
-                            asset.state = "loading";
-                            assets.push(asset);
-                        }
-
-                        //we need to always push to the promises collection to monitor correct 
-                        //execution                        
-                        promises.push(asset.deferred.promise);
-                    }
-                });
-
-
-                //gives a central monitoring of all assets to load
-                promise = $q.all(promises);
-
-                _.each(assets, function (asset) {
-                    LazyLoad.js(appendRnd(asset.path), function () {
-                        asset.state = "loaded";
-                        if (!scope) {
-                            asset.deferred.resolve(true);
-                        }
-                        else {
-                            angularHelper.safeApply(scope, function () {
-                                asset.deferred.resolve(true);
-                            });
-                        }
-                    });
-                });
-            }
-            else {
-                //return and resolve
+            if (nonEmpty.length === 0) {
                 var deferred = $q.defer();
                 promise = deferred.promise;
                 deferred.resolve(true);
+                return promise;
             }
 
+            //compile a list of promises
+            //blocking
+            var promises = [];
+            var assets = [];
+            _.each(nonEmpty, function (path) {
+                path = convertVirtualPath(path);
+                var asset = service._getAssetPromise(path);
+                //if not previously loaded, add to list of promises
+                if (asset.state !== "loaded") {
+                    if (asset.state === "new") {
+                        asset.state = "loading";
+                        assets.push(asset);
+                    }
+
+                    //we need to always push to the promises collection to monitor correct
+                    //execution
+                    promises.push(asset.deferred.promise);
+                }
+            });
+
+            //gives a central monitoring of all assets to load
+            promise = $q.all(promises);
+
+            // Split into css and js asset arrays, and use LazyLoad on each array
+            var cssAssets = _.filter(assets,
+                function (asset) {
+                    return asset.path.match(/(\.css$|\.css\?)/ig);
+                });
+            var jsAssets = _.filter(assets,
+                function (asset) {
+                    return asset.path.match(/(\.js$|\.js\?)/ig);
+                });
+
+            function assetLoaded(asset) {
+                asset.state = "loaded";
+                if (!scope) {
+                    asset.deferred.resolve(true);
+                    return;
+                }
+                angularHelper.safeApply(scope,
+                    function () {
+                        asset.deferred.resolve(true);
+                    });
+            }
+
+            if (cssAssets.length > 0) {
+                var cssPaths = _.map(cssAssets, function (asset) { return appendRnd(asset.path) });
+                LazyLoad.css(cssPaths, function() { _.each(cssAssets, assetLoaded); });
+            }
+
+            if (jsAssets.length > 0) {
+                var jsPaths = _.map(jsAssets, function (asset) { return appendRnd(asset.path) });
+                LazyLoad.js(jsPaths, function () { _.each(jsAssets, assetLoaded); });
+            }
 
             return promise;
         }

src/Umbraco.Web.UI.Client/src/common/services/history.service.js

@@ -115,6 +115,27 @@ angular.module('umbraco.services')
 		 */
 		getCurrent: function(){
 			return nArray;
-		}
+        },
+
+        /**
+		 * @ngdoc method
+		 * @name umbraco.services.historyService#getLastAccessedItemForSection
+		 * @methodOf umbraco.services.historyService
+		 *
+		 * @description
+		 * Method to return the item that was last accessed in the given section
+		 *
+         * @param {string} sectionAlias Alias of the section to return the last accessed item for.
+		 */
+        getLastAccessedItemForSection: function (sectionAlias) {
+            for (var i = 0, len = nArray.length; i < len; i++) {
+                var item = nArray[i];
+                if (item.link.indexOf(sectionAlias + "/") === 0) {
+                    return item;
+                }
+            }
+
+            return null;
+        }
 	};
 });

src/Umbraco.Web.UI.Client/src/common/services/listviewhelper.service.js

@@ -269,7 +269,8 @@
             var isSelected = false;
             for (var i = 0; selection.length > i; i++) {
                 var selectedItem = selection[i];
-                if (item.id === selectedItem.id || item.key === selectedItem.key) {
+                // if item.id is 2147483647 (int.MaxValue) use item.key
+                if ((item.id !== 2147483647 && item.id === selectedItem.id) || item.key === selectedItem.key) {
                     isSelected = true;
                 }
             }
@@ -294,7 +295,8 @@
         function deselectItem(item, selection) {
             for (var i = 0; selection.length > i; i++) {
                 var selectedItem = selection[i];
-                if (item.id === selectedItem.id) {
+                // if item.id is 2147483647 (int.MaxValue) use item.key
+                if ((item.id !== 2147483647 && item.id === selectedItem.id) || item.key === selectedItem.key) {
                     selection.splice(i, 1);
                     item.selected = false;
                 }
@@ -366,7 +368,7 @@
                 var item = items[i];
 
                 if (checkbox.checked) {
-                    selection.push({ id: item.id });
+                    selection.push({ id: item.id, key: item.key });
                 } else {
                     clearSelection = true;
                 }
@@ -405,7 +407,8 @@
                 for (var selectedIndex = 0; selection.length > selectedIndex; selectedIndex++) {
                     var selectedItem = selection[selectedIndex];
 
-                    if (item.id === selectedItem.id) {
+                    // if item.id is 2147483647 (int.MaxValue) use item.key
+                    if ((item.id !== 2147483647 && item.id === selectedItem.id) || item.key === selectedItem.key) {
                         numberOfSelectedItem++;
                     }
                 }

src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js

@@ -242,8 +242,8 @@
                 var propGroups = _.find(genericTab.properties, function (item) {
                     return item.alias === "_umb_membergroup";
                 });
-                saveModel.email = propEmail.value;
-                saveModel.username = propLogin.value;
+                saveModel.email = propEmail.value.trim();
+                saveModel.username = propLogin.value.trim();
                 
                 saveModel.password = this.formatChangePasswordModel(propPass.value);
 

src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js

@@ -11,6 +11,18 @@
             { "value": 3, "name": "Invited", "key": "Invited", "color": "warning" }
         ];
 
+        angular.forEach(userStates, function (userState) {
+            var key = "user_state" + userState.key;
+            localizationService.localize(key).then(function (value) {
+                var reg = /^\[[\S\s]*]$/g;
+                var result = reg.test(value);
+                if (result === false) {
+                    // Only translate if key exists
+                    userState.name = value;
+                }
+            });
+        });
+
         function getUserStateFromValue(value) {
             var foundUserState;
             angular.forEach(userStates, function (userState) {

src/Umbraco.Web.UI.Client/src/installer/installer.service.js

@@ -17,7 +17,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
 
 	//add to umbraco installer facts here
 	var facts = ['Umbraco helped millions of people watch a man jump from the edge of space',
-					'Over 420 000 websites are currently powered by Umbraco',
+					'Over 440 000 websites are currently powered by Umbraco',
 					"At least 2 people have named their cat 'Umbraco'",
 					'On an average day, more than 1000 people download Umbraco',
 					'<a target="_blank" href="https://umbraco.tv">umbraco.tv</a> is the premier source of Umbraco video tutorials to get you started',
@@ -31,10 +31,10 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
 					"At least 4 people have the Umbraco logo tattooed on them",
 					"'Umbraco' is the danish name for an allen key",
 					"Umbraco has been around since 2005, that's a looong time in IT",
-					"More than 550 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='https://umbra.co/codegarden'>CodeGarden</a>", 
+					"More than 600 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='https://umbra.co/codegarden'>CodeGarden</a>", 
 					"While you are installing Umbraco someone else on the other side of the planet is probably doing it too",
 					"You can extend Umbraco without modifying the source code using either JavaScript or C#",
-					"Umbraco was installed in more than 165 countries in 2015"
+					"Umbraco has been installed in more than 198 countries"
 					 ];
 
     /**

src/Umbraco.Web.UI.Client/src/installer/steps/user.html

@@ -18,7 +18,7 @@
 				<div class="control-group">
 					<label class="control-label" for="email">Email</label>
 					<div class="controls">
-						<input type="text" id="email" name="email" placeholder="you@example.com" required ng-model="installer.current.model.email" val-email />
+						<input type="email" id="email" name="email" placeholder="you@example.com" required ng-model="installer.current.model.email" val-email />
 						<small class="inline-help">Your email will be used as your login</small>
 					</div>
 				</div>

src/Umbraco.Web.UI.Client/src/less/buttons.less

@@ -261,6 +261,9 @@ input[type="submit"].btn {
     *padding-top: 1px;
     *padding-bottom: 1px;
   }
+
+  // Safari defaults to 1px for input. Ref U4-7721.
+  margin: 0px;
 }
 
 

src/Umbraco.Web.UI.Client/src/less/components/overlays.less

@@ -2,7 +2,7 @@
     position: fixed;
     overflow: hidden;
     background: @white;
-    z-index: 7500;
+    z-index: @zindexUmbOverlay;
     animation: fadeIn 0.2s;
     box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
 }

src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-overlay-backdrop.less

@@ -3,8 +3,8 @@
    width: 100%;
    height: 100%;
    background-color: rgba(255, 255, 255, 0.50);
-   z-index: 2000;
+   z-index: @zindexOverlayBackdrop;
    top: 0;
    left: 0;
    animation: fadeIn 0.2s;
-}
+}

src/Umbraco.Web.UI.Client/src/less/components/umb-avatar.less

@@ -6,6 +6,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    margin: 0 auto;
     color: @black;
     font-weight: bold;
     font-size: 16px;

src/Umbraco.Web.UI.Client/src/less/components/umb-breadcrumbs.less

@@ -35,3 +35,10 @@
    margin-right: 5px;
    color: @gray-7;
 }
+
+input.umb-breadcrumbs__add-ancestor {
+    height: 25px;
+    margin-top: -2px;
+    margin-left: 3px;
+    width: 100px;
+}

src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less

@@ -636,9 +636,19 @@
     clear: both;
 }
 
-.umb-grid .mce-btn button {
-    padding: 8px 6px;
-    line-height: inherit;
+.umb-grid .mce-btn {
+    button {
+        padding-top: 8px;
+        padding-bottom: 8px;
+        padding-left: 6px;
+        line-height: inherit;
+    }
+
+    &:not(.mce-menubtn) {
+        button {
+            padding-right: 6px;
+        }
+    }
 }
 
 .umb-grid .mce-toolbar {

src/Umbraco.Web.UI.Client/src/less/components/users/umb-user-cards.less

@@ -11,6 +11,8 @@
     flex: 0 0 100%;
     max-width: 100%;
     display: flex;
+    flex-wrap: wrap;
+    flex-direction: column;
 }
 
 .umb-user-card:hover,

src/Umbraco.Web.UI.Client/src/less/dashboards.less

@@ -5,21 +5,20 @@
 	top: -30px;
 	padding-top: 30px;
 	box-shadow: inset 0px -40px 30px 25px rgba(255,255,255,1);
-	border-radius: 0px 0px 200px 200px;
-	-moz-border-radius: 0px 0px 200px 200px;
+    -moz-border-radius: 0px 0px 200px 200px;
 	-webkit-border-radius: 0px 0px 200px 200px;
+	border-radius: 0px 0px 200px 200px;
 
     small {
 	    font-size: 14px;
 	    opacity: .5;
     }
 
-    .umb-loader{
+    .umb-loader {
         width: 640px;
         height: 4px;
     }
 
-
     .video_player{
 		video {
 	        width: 100%;
@@ -27,8 +26,8 @@
 	        border: 1px solid @gray-9;
 	        border-left: none;
 	        border-bottom: none;
+            -moz-box-sizing:border-box;
 	        box-sizing:border-box;
-	        -moz-box-sizing:border-box;
 		}
 
 		input[type="range"] {
@@ -67,8 +66,8 @@
 
 		.progress-bar {
 		    display: block;
-		    box-sizing: border-box;
-		    -moz-box-sizing:border-box;
+            -moz-box-sizing:border-box;
+		    box-sizing: border-box;   
 		    max-width: 100%;
 		    width: 200px;
 		    height: 100%;
@@ -112,26 +111,25 @@
 		line-height: 80px;
 		text-align: center;
 		position: relative;
+        display: flex;
+        justify-content: center;
 
-		i, h3 {
+		.icon, h3 {
 			display: inline-block;
 		}
 
-		i {
-			position: absolute;
-			top: 50%;
-			margin-top: -40px;
+		.icon {
+            font-size: 80px;
 		}
 
 		h3 {
-			margin: 0;
+			margin: 0 0 0 20px;
 			line-height: 80px;
 			font-weight: 700;
-			margin-left: 100px;
 			font-size: 36px;
 			letter-spacing: -1px;
 		}
 	}
 
 
-}
+}

src/Umbraco.Web.UI.Client/src/less/healthcheck.less

@@ -29,12 +29,12 @@
 	padding: 15px 10px;
 	box-sizing: border-box;
 	text-align: center;
-	border: 2px solid transparent;
+	border: 1px solid @gray-8;
 	height: 100%;
 }
 
 .umb-healthcheck-group:hover {
-	border: 2px solid @turquoise;
+	border: 1px solid @turquoise;
 	cursor: pointer;
 }
 

src/Umbraco.Web.UI.Client/src/less/navs.less

@@ -249,6 +249,11 @@
     border-radius: 0;
 }
 
+// fix dropdown with checkbox + long text in label
+.dropdown-menu > li > .flex > label {
+    flex: 1 1 0;
+}
+
 .dropdown-menu > li > a {
     padding: 8px 20px;
 }

src/Umbraco.Web.UI.Client/src/less/pages/login.less

@@ -66,7 +66,7 @@
     margin-bottom: auto;
 }
 
-.login-overlay .form input[type="text"], 
+.login-overlay .form input[type="text"],
 .login-overlay .form input[type="password"],
 .login-overlay .form input[type="email"] {
     height: 36px;
@@ -114,8 +114,44 @@
     line-height: 36px;
 }
 
-.login-overlay .text-error, 
-.login-overlay .text-info 
+.login-overlay .text-error,
+.login-overlay .text-info
 {
     font-weight:bold;
-} 
+}
+
+.password-toggle {
+    position: relative;
+    display: block;
+    user-select: none;
+
+    input::-ms-clear, input::-ms-reveal {
+        display: none;
+    }
+
+    a {
+        opacity: .5;
+        cursor: pointer;
+        display: inline-block;
+        position: absolute;
+        height: 1px;
+        width: 45px;
+        height: 75%;
+        font-size: 0;
+        background-repeat: no-repeat;
+        background-size: 50%;
+        background-position: center;
+        top: 0;
+        margin-left: -45px;
+        z-index: 1;
+        -webkit-tap-highlight-color: transparent;
+    }
+
+    [type="text"] + a {
+        background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M29.6.4C29 0 28 0 27.4.4L21 6.8c-1.4-.5-3-.8-5-.8C9 6 3 10 0 16c1.3 2.6 3 4.8 5.4 6.5l-5 5c-.5.5-.5 1.5 0 2 .3.4.7.5 1 .5s1 0 1.2-.4l27-27C30 2 30 1 29.6.4zM13 10c1.3 0 2.4 1 2.8 2L12 15.8c-1-.4-2-1.5-2-2.8 0-1.7 1.3-3 3-3zm-9.6 6c1.2-2 2.8-3.5 4.7-4.7l.7-.2c-.4 1-.6 2-.6 3 0 1.8.6 3.4 1.6 4.7l-2 2c-1.6-1.2-3-2.7-4-4.4zM24 13.8c0-.8 0-1.7-.4-2.4l-10 10c.7.3 1.6.4 2.4.4 4.4 0 8-3.6 8-8z'/%3E%3Cpath fill='%23444' d='M26 9l-2.2 2.2c2 1.3 3.6 3 4.8 4.8-1.2 2-2.8 3.5-4.7 4.7-2.7 1.5-5.4 2.3-8 2.3-1.4 0-2.6 0-3.8-.4L10 25c2 .6 4 1 6 1 7 0 13-4 16-10-1.4-2.8-3.5-5.2-6-7z'/%3E%3C/svg%3E");
+    }
+
+    [type="password"] + a {
+        background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='32' height='32' viewBox='0 0 32 32'%3E%3Cpath fill='%23444' d='M16 6C9 6 3 10 0 16c3 6 9 10 16 10s13-4 16-10c-3-6-9-10-16-10zm8 5.3c1.8 1.2 3.4 2.8 4.6 4.7-1.2 2-2.8 3.5-4.7 4.7-3 1.5-6 2.3-8 2.3s-6-.8-8-2.3C6 19.5 4 18 3 16c1.5-2 3-3.5 5-4.7l.6-.2C8 12 8 13 8 14c0 4.5 3.5 8 8 8s8-3.5 8-8c0-1-.3-2-.6-2.6l.4.3zM16 13c0 1.7-1.3 3-3 3s-3-1.3-3-3 1.3-3 3-3 3 1.3 3 3z'/%3E%3C/svg%3E");
+    }
+}

src/Umbraco.Web.UI.Client/src/less/property-editors.less

@@ -109,16 +109,48 @@ ul.color-picker li a  {
 }
 
 /* pre-value editor */
-
+/*.control-group.color-picker-preval:before {
+    content: "";
+    display: inline-block;
+    vertical-align: middle;
+    height: 100%;
+}*/
+
+/*.control-group.color-picker-preval div.thumbnail {
+    display: inline-block;
+    vertical-align: middle;
+}*/
+.control-group.color-picker-preval div.color-picker-prediv {
+    display: inline-block;
+    width: 60%;
+}
+
 .control-group.color-picker-preval pre {
     display: inline;
     margin-right: 20px;
     margin-left: 10px;
+    width: 50%;
+    white-space: nowrap;
+    overflow: hidden;
+    margin-bottom: 0;
+    vertical-align: middle;
 }
 
+.control-group.color-picker-preval btn {
+    //vertical-align: middle;
+}
+
+.control-group.color-picker-preval input[type="text"] {
+    min-width: 40%;
+    width: 40%;
+    display: inline-block;
+    margin-right: 20px;
+    margin-top: 1px;
+}
+
 .control-group.color-picker-preval label {
-    border:solid @white 1px;
-    padding:6px;
+    border: solid @white 1px;
+    padding: 6px;
 }
 
 
@@ -126,21 +158,21 @@ ul.color-picker li a  {
 // Media picker
 // --------------------------------------------------
 .umb-mediapicker .add-link {
-  display: inline-block;
-  height: 120px;
-  width: 120px;
-  text-align: center;
-  color: @gray-8;
-  border: 2px @gray-8 dashed;
-  line-height: 120px;
-  text-decoration: none;
+    display: flex;
+    justify-content:center;
+    align-items:center;
+    width: 120px;
+    text-align: center;
+    color: @gray-8;
+    border: 2px @gray-8 dashed;
+    text-decoration: none;
 
-  transition: all 150ms ease-in-out;
+    transition: all 150ms ease-in-out;
 
-  &:hover {
-      color: @turquoise-d1;
-      border-color: @turquoise;
-  }
+    &:hover {
+        color: @turquoise-d1;
+        border-color: @turquoise;
+    }
 }
 
 .umb-mediapicker .picked-image {
@@ -165,6 +197,10 @@ ul.color-picker li a  {
   text-decoration: none;
 }
 
+.umb-mediapicker .add-link-square {
+  height: 120px;
+}
+
 
 
 .umb-thumbnails{
@@ -207,11 +243,10 @@ ul.color-picker li a  {
 
 .umb-mediapicker .umb-sortable-thumbnails li {
     flex-direction: column;
-    margin: 0;
+    margin: 0 5px 0 0;
     padding: 5px;
 }
 
-
 .umb-sortable-thumbnails li:hover a {
     display: flex;
     justify-content: center;
@@ -219,16 +254,20 @@ ul.color-picker li a  {
 }
 
 .umb-sortable-thumbnails li img {
-  max-width:100%;
-  max-height:100%;
-  margin:auto;
-  display:block;
-  background-image: url(../img/checkered-background.png);
+    max-width:100%;
+    max-height:100%;
+    margin:auto;
+    display:block;
+    background-image: url(../img/checkered-background.png);
 }
 
-.umb-sortable-thumbnails li img.noScale{
-  max-width: none !important;
-  max-height: none !important;
+.umb-sortable-thumbnails li img.trashed {
+    opacity:0.3;
+}
+
+.umb-sortable-thumbnails li img.noScale {
+    max-width: none !important;
+    max-height: none !important;
 }
 
 .umb-sortable-thumbnails .umb-icon-holder {
@@ -254,8 +293,8 @@ ul.color-picker li a  {
 }
 
 .umb-sortable-thumbnails li:hover .umb-sortable-thumbnails__actions  {
-  opacity: 1;
-  visibility: visible;
+    opacity: 1;
+    visibility: visible;
 }
 
 .umb-sortable-thumbnails .umb-sortable-thumbnails__action {
@@ -285,27 +324,27 @@ ul.color-picker li a  {
 // -------------------------------------------------
 
 .umb-cropper{
-  position: relative;
+    position: relative;
 }
 
 .umb-cropper img, .umb-cropper-gravity img{
-   position: relative;
-   max-width: 100%;
-   height: auto;
-   top: 0;
-   left: 0;
+    position: relative;
+    max-width: 100%;
+    height: auto;
+    top: 0;
+    left: 0;
  }
 
  .umb-cropper img {
-     max-width: none;
+    max-width: none;
  }
 
  .umb-cropper .overlay, .umb-cropper-gravity .overlay {
-  top: 0;
-  left: 0;
-  cursor: move;
-  z-index: 6001;
-  position: absolute;
+    top: 0;
+    left: 0;
+    cursor: move;
+    z-index: @zindexCropperOverlay;
+    position: absolute;
 }
 
 .umb-cropper .viewport{
@@ -317,43 +356,43 @@ ul.color-picker li a  {
  }
 
 .umb-cropper-gravity .viewport{
-   overflow: hidden;
-   position: relative;
-   width: 100%;
-   height: 100%;
+    overflow: hidden;
+    position: relative;
+    width: 100%;
+    height: 100%;
 }
 
 
 .umb-cropper .viewport:after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  z-index: 5999;
-  -moz-opacity: .75;
-  opacity: .75;
-  filter: alpha(opacity=7);
-  -webkit-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
-  -moz-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
-  box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: @zindexCropperOverlay - 1;
+    -moz-opacity: .75;
+    opacity: .75;
+    filter: alpha(opacity=7);
+    -webkit-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+    -moz-box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
+    box-shadow: inset 0 0 0 20px white,inset 0 0 0 21px rgba(0,0,0,.1),inset 0 0 20px 21px rgba(0,0,0,.2);
 }
 
 .umb-cropper-gravity .overlay{
-  width: 14px;
-  height: 14px;
-  text-align: center;
-  border-radius: 20px;
-  background: @turquoise;
-  border: 3px solid @white;
-  opacity: 0.8;
+    width: 14px;
+    height: 14px;
+    text-align: center;
+    border-radius: 20px;
+    background: @turquoise;
+    border: 3px solid @white;
+    opacity: 0.8;
 }
 
 .umb-cropper-gravity .overlay i {
-  font-size: 26px;
-  line-height: 26px;
-  opacity: 0.8 !important;
+    font-size: 26px;
+    line-height: 26px;
+    opacity: 0.8 !important;
 }
 
 .umb-cropper .crop-container {
@@ -361,16 +400,16 @@ ul.color-picker li a  {
 }
 
 .umb-cropper .crop-slider {
-   padding: 10px;
-   border-top: 1px solid @gray-10;
-   margin-top: 10px;
-   display: flex;
-   align-items: center;
-   justify-content: center;
-   flex-wrap: wrap;
-   @media (min-width: 769px) {
+    padding: 10px;
+    border-top: 1px solid @gray-10;
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-wrap: wrap;
+    @media (min-width: 769px) {
         padding: 10px 50px 10px 50px;
-   }
+    }
 }
 
 .umb-cropper .crop-slider i {
@@ -438,6 +477,7 @@ ul.color-picker li a  {
         top: 3px;
         right: 3px;
         cursor: pointer;
+        z-index: 1;
     }
 
     .umb-close-cropper:hover {

src/Umbraco.Web.UI.Client/src/less/tree.less

@@ -119,6 +119,7 @@
 
 .umb-tree div > a.umb-options {
 	visibility: hidden;
+    flex: 1 0 auto;
 }
 .umb-tree div:hover > a.umb-options {
 	visibility: visible;
@@ -156,8 +157,8 @@
 
 .umb-tree li > div a:not(.umb-options) {
 	padding: 6px 0;
-	width: 100%;
 	display: flex;
+    flex: 1 1 100%;
 }
 
 .umb-tree li > div:hover a:not(.umb-options) {

src/Umbraco.Web.UI.Client/src/less/variables.less

@@ -230,6 +230,12 @@
 @zindexModalBackdrop:     1040;
 @zindexModal:             1050;
 
+@zindexUmbOverlay:        7500;
+@zindexOverlayBackdrop:   2000;
+
+// Sticky bar has a z-index of "500", which is set from javascript in directive
+// so set z-index of cropper should be lower to be behind sticky bar.
+@zindexCropperOverlay:    499;
 
 // Sprite icons path
 // -------------------------

src/Umbraco.Web.UI.Client/src/routes.js

@@ -31,6 +31,12 @@ app.config(function ($routeProvider) {
                             userService.getCurrentUser({ broadcastEvent: broadcast }).then(function (user) {
                                 //is auth, check if we allow or reject
                                 if (isRequired) {
+
+                                    //This checks the current section and will force a redirect to 'content' as the default
+                                    if ($route.current.params.section.toLowerCase() === "default" || $route.current.params.section.toLowerCase() === "umbraco" || $route.current.params.section === "") {
+                                        $route.current.params.section = "content";
+                                    }
+
                                     // U4-5430, Benjamin Howarth
                                     // We need to change the current route params if the user only has access to a single section
                                     // To do this we need to grab the current user's allowed sections, then reject the promise with the correct path.
@@ -98,26 +104,24 @@ app.config(function ($routeProvider) {
             resolve: doLogout()
         })
         .when('/:section', {
+            
             //This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
             template: "<div ng-include='templateUrl'></div>",
             //This controller will execute for this route, then we can execute some code in order to set the template Url
             controller: function ($scope, $route, $routeParams, $location, sectionService) {
-                if ($routeParams.section.toLowerCase() === "default" || $routeParams.section.toLowerCase() === "umbraco" || $routeParams.section === "") {
-                    $routeParams.section = "content";
-                }
-
-                //We are going to check the currently loaded sections for the user and if the section we are navigating
+                
+                //We are going to check the currently loaded sections for the user and if the section we are navigating
                 //to has a custom route path we'll use that 
                 sectionService.getSectionsForUser().then(function(sections) {
-                    //find the one we're requesting
+                    //find the one we're requesting
                     var found = _.find(sections, function(s) {
                         return s.alias === $routeParams.section;
-                    })
+                    })
                     if (found && found.routePath) {
                         //there's a custom route path so redirect
                         $location.path(found.routePath);
                     }
-                    else {
+                    else {
                         //there's no custom route path so continue as normal
                         $routeParams.url = "dashboard.aspx?app=" + $routeParams.section;
                         $scope.templateUrl = 'views/common/dashboard.html';            
@@ -138,8 +142,8 @@ app.config(function ($routeProvider) {
         })
         .when('/:section/:tree/:method', {
             templateUrl: function (rp) {
-
-                //if there is no method registered for this then show the dashboard
+
+                //if there is no method registered for this then show the dashboard
                 if (!rp.method)
                     return "views/common/dashboard.html";
                 

src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js

@@ -16,7 +16,11 @@
       maxFileSize: Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB",
       acceptedFileTypes: mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes),
       uploaded: false
-    }
+    }
+    $scope.togglePassword = function () {
+        var elem = $("form[name='loginForm'] input[name='password']");
+        elem.attr("type", (elem.attr("type") === "text" ? "password" : "text"));
+    }
 
     function init() {
       // Check if it is a new user
@@ -48,7 +52,7 @@
         ]).then(function () {
 
           $scope.inviteStep = Number(inviteVal);
-          
+
         });
       }
     }
@@ -82,7 +86,7 @@
           var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
 
           // set percentage property on file
-          $scope.avatarFile.uploadProgress = progressPercentage;  
+          $scope.avatarFile.uploadProgress = progressPercentage;
         }
 
       }).success(function (data, status, headers, config) {
@@ -149,11 +153,11 @@
 
             //error
             formHelper.handleError(err);
-            
+
             $scope.invitedUserPasswordModel.buttonState = "error";
 
           });
-      }      
+      }
     };
 
     var setFieldFocus = function (form, field) {
@@ -180,7 +184,7 @@
     }
 
     function resetInputValidation() {
-      $scope.confirmPassword = "";
+      $scope.confirmPassword = "";
       $scope.password = "";
       $scope.login = "";
       if ($scope.loginForm) {
@@ -255,7 +259,7 @@
 
       //TODO: Do validation properly like in the invite password update
 
-      //if the login and password are not empty we need to automatically 
+      //if the login and password are not empty we need to automatically
       // validate them - this is because if there are validation errors on the server
       // then the user has to change both username & password to resubmit which isn't ideal,
       // so if they're not empty, we'll just make sure to set them to valid.
@@ -289,7 +293,7 @@
         });
 
       //setup a watch for both of the model values changing, if they change
-      // while the form is invalid, then revalidate them so that the form can 
+      // while the form is invalid, then revalidate them so that the form can
       // be submitted again.
       $scope.loginForm.username.$viewChangeListeners.push(function () {
         if ($scope.loginForm.username.$invalid) {

src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html

@@ -24,8 +24,8 @@
             </label>
             <input type="password" ng-model="invitedUserPasswordModel.password" name="password" class="-full-width-input" umb-auto-focus required val-server-field="value" autocomplete="off" ng-minlength="{{invitedUserPasswordModel.passwordPolicies.minPasswordLength}}" />
             <span class="help-inline" val-msg-for="password" val-toggle-msg="required"><localize key="user_passwordIsBlank">Your new password cannot be blank!</localize></span>
-            <span class="help-inline" val-msg-for="password" val-toggle-msg="minlength">Minimum {{invitedUserPasswordModel.passwordPolicies.minPasswordLength}} characters</span>    
-            <span class="help-inline" val-msg-for="password" val-toggle-msg="valServerField"></span>     
+            <span class="help-inline" val-msg-for="password" val-toggle-msg="minlength">Minimum {{invitedUserPasswordModel.passwordPolicies.minPasswordLength}} characters</span>
+            <span class="help-inline" val-msg-for="password" val-toggle-msg="valServerField"></span>
           </div>
 
           <div class="control-group" ng-class="{error: setPasswordForm.confirmPassword.$invalid}">
@@ -49,15 +49,15 @@
       <div class="form" ng-if="inviteStep === 2">
 
         <div class="flex justify-center items-center">
-          
+
           <ng-form name="avatarForm">
-            
+
             <umb-progress-bar style="max-width: 100px; margin-bottom: 5px;"
                               ng-show="avatarFile.uploadStatus === 'uploading'"
                               progress="{{ avatarFile.uploadProgress }}"
                               size="s">
             </umb-progress-bar>
-            
+
             <div class="umb-info-local-item text-error mt3" ng-if="avatarFile.uploadStatus === 'error'">
               {{ avatarFile.serverErrorMessage }}
             </div>
@@ -69,7 +69,7 @@
                  ngf-multiple="false"
                  ngf-pattern="{{avatarFile.acceptedFileTypes}}"
                  ngf-max-size="{{ avatarFile.maxFileSize }}">
-                  
+
                   <umb-avatar color="gray"
                               size="xl"
                               unknown-char="+"
@@ -77,7 +77,7 @@
                               img-srcset="{{invitedUser.avatars[4]}} 2x, {{invitedUser.avatars[4]}} 3x">
                   </umb-avatar>
               </a>
-            
+
           </ng-form>
         </div>
 
@@ -149,7 +149,9 @@
 
             <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
               <label><localize key="general_password">Password</localize></label>
-              <input type="password" ng-model="password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" autocomplete="off" />
+              <div class="password-toggle">
+                <input type="password" ng-model="password" name="password" class="-full-width-input" localize="placeholder" placeholder="@placeholders_password" autocomplete="off" /><a ng-click="togglePassword()">Toggle</a>
+              </div>
             </div>
 
             <div class="flex justify-between items-center">

src/Umbraco.Web.UI.Client/src/views/common/overlays/embed/embed.html

@@ -2,7 +2,7 @@
 
    <umb-control-group label="@general_url">
        <input id="url" class="umb-editor input-block-level" type="text" style="margin-bottom: 10px;" ng-model="model.embed.url" ng-keyup="$event.keyCode == 13 ? vm.showPreview() : null" required />
-       <input type="button" ng-click="vm.showPreview()" class="btn" localize="value" value="@general_retrieve" />
+       <input type="button" ng-click="vm.showPreview()" class="btn" value="@general_retrieve" localize="value" />
    </umb-control-group>
 
    <umb-control-group>
@@ -12,15 +12,15 @@
 
    <div ng-show="model.embed.supportsDimensions">
        <umb-control-group label="@general_width">
-           <input type="text" ng-model="model.embed.width" on-blur="vm.changeSize('width')" />
+          <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.width" on-blur="vm.changeSize('width')" />
        </umb-control-group>
 
        <umb-control-group label="@general_height">
-          <input type="text" ng-model="model.embed.height" on-blur="vm.changeSize('height')" />
+          <input type="number" pattern="[0-9]*" min="0" ng-model="model.embed.height" on-blur="vm.changeSize('height')" />
        </umb-control-group>
 
        <umb-control-group label="@general_constrain">
-          <input id="constrain" type="checkbox" ng-model="model.embed.constrain" />
+           <input id="constrain" type="checkbox" ng-model="model.embed.constrain" />
        </umb-control-group>
    </div>
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html

@@ -31,7 +31,7 @@
                 <div class="umb-el-wrap">
                     <label class="control-label" for="altField"><localize key="templateEditor_fallbackField">Fallback field</localize></label>
                     <div class="controls">
-                        <select ng-model="vm.altField" >
+                        <select ng-model="vm.altField" id="altField">
                             <optgroup localize="label" label="@templateEditor_customFields">
                                 <option ng-repeat="(key, value) in vm.properties" value="{{value}}">{{value}}</option>
                             </optgroup>
@@ -43,6 +43,7 @@
                 </div>
             </div>
         </div>
+        </div>
 
         <!-- Default value -->
         <div>
@@ -55,7 +56,7 @@
                 <div class="umb-el-wrap">
                     <label class="control-label" for="altText"><localize key="templateEditor_defaultValue">Default value</localize></label>
                     <div class="controls">
-                        <input type="text" name="altText" ng-model="vm.altText" umb-auto-focus>
+                        <input type="text" id="altText" name="altText" ng-model="vm.altText" umb-auto-focus>
                     </div>
                 </div>
             </div>
@@ -65,11 +66,13 @@
         <div class="control-group umb-control-group">
             <div class="umb-el-wrap">
                 <div class="controls">
-                    <label class="control-label" for="recursive">
+                    <label class="control-label" >
                         <localize key="templateEditor_recursive">Recursive</localize>
                     </label>
-                    <input type="checkbox" name="recursive" ng-model="vm.recursive">
-                    <localize key="templateEditor_recursiveDescr">Yes, make it recursive</localize>
+                    <label for="recursive"> 
+                        <input id="recursive" type="checkbox" name="recursive" ng-model="vm.recursive">
+                        <localize key="templateEditor_recursiveDescr">Yes, make it recursive</localize>
+                    </label>
                 </div>
             </div>
         </div>
@@ -134,7 +137,7 @@
                     <small><localize key="templateEditor_insertedBefore">Will be inserted before the field value</localize></small>
                 </label>
                 <div class="controls">
-                    <input type="text" name="insertBefore" class="-full-width-input" ng-model="vm.insertBefore">
+                    <input type="text" id="insertBefore" name="insertBefore" class="-full-width-input" ng-model="vm.insertBefore">
                 </div>
             </div>
         </div>
@@ -147,7 +150,7 @@
                     <small><localize key="templateEditor_insertedAfter">Will be inserted after the field value</localize></small>
                 </label>
                 <div class="controls">
-                    <input type="text" name="insertAfter" class="-full-width-input" ng-model="vm.insertAfter">
+                    <input type="text" id="insertAfter" name="insertAfter" class="-full-width-input" ng-model="vm.insertAfter">
                 </div>
             </div>
         </div>
@@ -162,8 +165,10 @@
                             <small><localize key="templateEditor_convertLineBreaksHelp">Replaces line breaks with break html tag</localize></small>
                         </label>
                     </div>
-                    <input type="checkbox" name="linebreaks" ng-model="vm.convertLinebreaks">
-                    <localize key="templateEditor_convertLineBreaksDescription">Yes, convert line breaks</localize>
+                    <label for="linebreaks">
+                      <input type="checkbox" id="linebreaks" name="linebreaks" ng-model="vm.convertLinebreaks">
+                      <localize key="templateEditor_convertLineBreaksDescription">Yes, convert line breaks</localize>
+                    </label>
                 </div>
             </div>
         </div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js

@@ -56,6 +56,46 @@ angular.module("umbraco")
                 $scope.target = dialogOptions.currentTarget;
             }
 
+            function onInit() {
+                if ($scope.startNodeId !== -1) {
+                    entityResource.getById($scope.startNodeId, "media")
+                        .then(function (ent) {
+                            $scope.startNodeId = ent.id;
+                            run();
+                        });
+                } else {
+                    run();
+                }
+            }
+
+            function run() {
+                //default root item
+                if (!$scope.target) {
+                    if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
+                        entityResource.getById($scope.lastOpenedNode, "media")
+                            .then(ensureWithinStartNode, gotoStartNode);
+                    } else {
+                        gotoStartNode();
+                    }
+                } else {
+                    //if a target is specified, go look it up - generally this target will just contain ids not the actual full
+                    //media object so we need to look it up
+                    var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
+                    var altText = $scope.target.altText;
+                    mediaResource.getById(id)
+                        .then(function (node) {
+                            $scope.target = node;
+                            if (ensureWithinStartNode(node)) {
+                                selectImage(node);
+                                $scope.target.url = mediaHelper.resolveFile(node);
+                                $scope.target.altText = altText;
+                                $scope.openDetailsDialog();
+                            }
+                        },
+                        gotoStartNode);
+                }
+            }
+
             $scope.upload = function(v) {
                 angular.element(".umb-file-dropzone-directive .file-select").click();
             };
@@ -107,7 +147,7 @@ angular.module("umbraco")
 
                 if (folder.id > 0) {
                     entityResource.getAncestors(folder.id, "media")
-                        .then(function(anc) {
+                        .then(function(anc) {              
                             $scope.path = _.filter(anc,
                                 function(f) {
                                     return f.path.indexOf($scope.startNodeId) !== -1;
@@ -218,32 +258,6 @@ angular.module("umbraco")
                 $scope.gotoFolder({ id: $scope.startNodeId, name: "Media", icon: "icon-folder" });
             }
 
-            //default root item
-            if (!$scope.target) {
-                if ($scope.lastOpenedNode && $scope.lastOpenedNode !== -1) {
-                    entityResource.getById($scope.lastOpenedNode, "media")
-                        .then(ensureWithinStartNode, gotoStartNode);
-                } else {
-                    gotoStartNode();
-                }
-            } else {
-                //if a target is specified, go look it up - generally this target will just contain ids not the actual full
-                //media object so we need to look it up
-                var id = $scope.target.udi ? $scope.target.udi : $scope.target.id
-                var altText = $scope.target.altText;
-                mediaResource.getById(id)
-                    .then(function(node) {
-                            $scope.target = node;
-                            if (ensureWithinStartNode(node)) {
-                                selectImage(node);
-                                $scope.target.url = mediaHelper.resolveFile(node);
-                                $scope.target.altText = altText;
-                                $scope.openDetailsDialog();
-                            }
-                        },
-                        gotoStartNode);
-            }
-
             $scope.openDetailsDialog = function() {
 
                 $scope.mediaPickerDetailsOverlay = {};
@@ -368,4 +382,7 @@ angular.module("umbraco")
                     }
                 }
             }
+
+            onInit();
+
         });

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html

@@ -48,14 +48,14 @@
                <span class="umb-breadcrumbs__seperator">&#47;</span>
             </li>
 
-            <li class="umb-breadcrumbs__ancestor" ng-if="!lockedFolder">
+            <li class="umb-breadcrumbs__ancestor" ng-show="!lockedFolder">
                <a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
                   <i class="icon icon-add small"></i>
                </a>
 
                <input
                   type="text"
-                  class="input-foldername input-mini inline"
+                  class="umb-breadcrumbs__add-ancestor"
                   ng-show="showFolderInput"
                   ng-model="newFolderName"
                   ng-keydown="enterSubmitFolder($event)"

src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html

@@ -98,7 +98,7 @@
                         <localize key="contentTypeEditor_inheritedFrom"></localize> {{ tab.inheritedFromName }}
 
                         <span ng-repeat="contentTypeName in tab.parentTabContentTypeNames">
-                            {{ contentTypeName }}
+                            <a href="#/settings/documentTypes/edit/{{tab.contentTypeId}}">{{ contentTypeName }}</a>
                             <span ng-if="!$last">, </span>
                         </span>
                     </div>

src/Umbraco.Web.UI.Client/src/views/components/umb-node-preview.html

@@ -16,6 +16,6 @@
         <a class="umb-node-preview__action" title="Open" href="" ng-if="allowEdit"  ng-click="onEdit()"><localize key="general_edit">Edit</localize></a>
         <a class="umb-node-preview__action" title="Open" href="" ng-if="allowOpen"  ng-click="onOpen()"><localize key="general_open">Open</localize></a>
         <a class="umb-node-preview__action umb-node-preview__action--red" title="Remove" href="" ng-if="allowRemove" ng-click="onRemove()"><localize key="general_remove">Remove</localize></i></a>
-    <div>
+    </div>
 
 </div>

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html

@@ -1,5 +1,5 @@
 <h3>Hours of Umbraco training videos are only a click away</h3>
-<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco. And visit <a class="btn-link -underline"  href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos</p>
+<p>Want to master Umbraco? Spend a couple of minutes learning some best practices by watching one of these videos about using Umbraco, then visit <a class="btn-link -underline"  href="http://umbraco.tv" target="_blank">umbraco.tv</a> for even more Umbraco videos.</p>
 
 <div class="row-fluid"
 	ng-init="init('http://umbraco.tv/videos/developer/chapterrss?sort=no')"
@@ -7,14 +7,12 @@
 
 	<ul class="thumbnails" >
 		<li class="span2" ng-repeat="video in videos">
-	    	<div class="thumbnail" style="margin-right: 20px; padding: 20px;">
-		    	<a class="btn-link -underline"  target="_blank" href="{{video.link}}" title="{{video.title}}">
-		    		<img ng-src="{{video.thumbnail}}"  alt="{{video.title}}">
-		    	</a>
-		    	<a target="_blank" href="{{video.link}}" title="{{video.title}}">
-		    		<div style="font-weight: bold; text-align: center; margin: 20px 0 0;">{{video.title}}</div>
-		    	</a>
-	    	</div>
+            <a class="btn-link" target="_blank" href="{{video.link}}" title="{{video.title}}">
+                <div class="thumbnail" style="margin-right: 20px; padding: 20px;">
+                    <img ng-src="{{video.thumbnail}}" alt="{{video.title}}">
+                    <div style="font-weight: bold; text-align: center; margin: 20px 0 0;">{{video.title}}</div>
+                </div>
+            </a>
 	    </li>
 	</ul>
 </div>

src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html

@@ -19,7 +19,7 @@
                 <button
                     ng-if="vm.dashboard.urlTrackerDisabled === true"
                     type="button"
-                    class="umb-era-button umb-button--s -blue"
+                    class="umb-era-button umb-button--s -green"
                     ng-click="vm.enableUrlTracker()">
                     <span><localize key="redirectUrls_enableUrlTracker">Enable URL Tracker</localize></span>
                 </button>

src/Umbraco.Web.UI.Client/src/views/dashboard/forms/formsdashboardintro.html

@@ -2,7 +2,7 @@
 	<div style="max-width: 800px; text-align: center; margin: auto; padding: 20px; min-height: 800px;">
 
 		<div class="installer-top"> <!-- ADDED -->
-			<i style="font-size: 80px" class="icon icon-umb-contour"></i>
+			<i class="icon icon-umb-contour"></i>
 			<h3>Umbraco Forms</h3>
 		</div> <!-- ADDED -->