Bump version

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

@@ -15,40 +15,38 @@ function Build-UmbracoDocs
 
   ################ Do the UI docs
 
-  # create Belle build folder, so that we don't cause a Belle rebuild
-  $belleBuildDir = "$src\Umbraco.Web.UI.Client\build"
-  if (-not (Test-Path $belleBuildDir)) 
+  # No need to build belle again if it exists
+  $belleAppJs = "$src\Umbraco.Web.UI\Umbraco\js\app.js"
+  if(-not (Test-Path $belleAppJs)) 
   {
-      mkdir $belleBuildDir > $null
+	  # 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 "Build UI documentation"
-
-  # 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 $_}}
-
   # change baseUrl
   $baseUrl = "https://our.umbraco.org/apidocs/ui/"
   $indexPath = "$src/Umbraco.Web.UI.Client/docs/api/index.html"

src/SolutionInfo.cs

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

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.6.7");
+        private static readonly Version Version = new Version("7.6.8");
 
         /// <summary>
         /// Gets the current version of Umbraco.

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

@@ -304,7 +304,7 @@ ul.color-picker li a  {
   top: 0;
   left: 0;
   cursor: move;
-  z-index: 499;
+  z-index: 6001;
   position: absolute;
 }
 

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

@@ -2379,9 +2379,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7670</DevelopmentServerPort>
+          <DevelopmentServerPort>7680</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7670</IISUrl>
+          <IISUrl>http://localhost:7680</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web/Editors/AuthenticationController.cs

@@ -139,9 +139,7 @@ namespace Umbraco.Web.Editors
 
                     //get the user
                     var user = Security.GetBackOfficeUser(loginModel.Username);
-
-                    if (UserManager != null)
-                        UserManager.RaiseLoginSuccessEvent(user.Id);
+                    UserManager.RaiseLoginSuccessEvent(user.Id);
 
                     return SetPrincipalAndReturnUserDetail(user);
                 case SignInStatus.RequiresVerification:
@@ -177,8 +175,7 @@ namespace Umbraco.Web.Editors
                         userId = attemptedUser.Id
                     });
 
-                    if (UserManager != null)
-                        UserManager.RaiseLoginRequiresVerificationEvent(attemptedUser.Id);
+                    UserManager.RaiseLoginRequiresVerificationEvent(attemptedUser.Id);
 
                     return verifyResponse;
 
@@ -225,10 +222,9 @@ namespace Umbraco.Web.Editors
                         Services.TextService.Localize("login/resetPasswordEmailCopySubject",
                             //Ensure the culture of the found user is used for the email!
                             UserExtensions.GetUserCulture(identityUser.Culture, Services.TextService)),
-                        message);
-
-                    if(UserManager != null)
-                        UserManager.RaiseForgotPasswordRequestedEvent(user.Id);
+                        message);
+
+                    UserManager.RaiseForgotPasswordRequestedEvent(user.Id);
                 }
             }
 
@@ -295,14 +291,10 @@ namespace Umbraco.Web.Editors
             switch (result)
             {
                 case SignInStatus.Success:
-                    if (UserManager != null)
-                        UserManager.RaiseLoginSuccessEvent(user.Id);
-
+                    UserManager.RaiseLoginSuccessEvent(user.Id);
                     return SetPrincipalAndReturnUserDetail(user);
                 case SignInStatus.LockedOut:
-                    if (UserManager != null)
-                            UserManager.RaiseAccountLockedEvent(user.Id);
-
+                    UserManager.RaiseAccountLockedEvent(user.Id);
                     return Request.CreateValidationErrorResponse("User is locked out");                    
                 case SignInStatus.Failure:
                 default:
@@ -325,16 +317,16 @@ namespace Umbraco.Web.Editors
                 {
                     Logger.Info<AuthenticationController>(
                         "User {0} is currently locked out, unlocking and resetting AccessFailedCount",
-                        () => model.UserId);
+                        () => model.UserId);
 
                     //var user = await UserManager.FindByIdAsync(model.UserId);
-                    var unlockResult = await UserManager.SetLockoutEndDateAsync(model.UserId, DateTimeOffset.Now);
-                    if(unlockResult.Succeeded == false)
+                    var unlockResult = await UserManager.SetLockoutEndDateAsync(model.UserId, DateTimeOffset.Now);
+                    if(unlockResult.Succeeded == false)
                     {
                         Logger.Warn<AuthenticationController>("Could not unlock for user {0} - error {1}",
-                                        () => model.UserId, () => unlockResult.Errors.First());
-                    }
-
+                                        () => model.UserId, () => unlockResult.Errors.First());
+                    }
+
                     var resetAccessFailedCountResult = await UserManager.ResetAccessFailedCountAsync(model.UserId);
                     if (resetAccessFailedCountResult.Succeeded == false)
                     {
@@ -342,9 +334,8 @@ namespace Umbraco.Web.Editors
                             () => model.UserId, () => unlockResult.Errors.First());
                     }
                 }
-
-                if(UserManager != null)
-                    UserManager.RaiseForgotPasswordChangedSuccessEvent(model.UserId);
+
+                UserManager.RaiseForgotPasswordChangedSuccessEvent(model.UserId);
                 return Request.CreateResponse(HttpStatusCode.OK);
             }
             return Request.CreateValidationErrorResponse(