From c37ba0dc8a06c856594c890fb3d9519211f2f22a Mon Sep 17 00:00:00 2001
From: Dennis Spijkerboer <d.spijkerboer@novaware.nl>
Date: Thu, 29 Oct 2015 12:56:07 +0100
Subject: [PATCH 01/68] Checked if the trimmed value starts and ends with
 brackets. If so, use the trimmed value.

---
 src/Umbraco.Web/umbraco.presentation/helper.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/helper.cs b/src/Umbraco.Web/umbraco.presentation/helper.cs
index f9292702e0..0d133fee66 100644
--- a/src/Umbraco.Web/umbraco.presentation/helper.cs
+++ b/src/Umbraco.Web/umbraco.presentation/helper.cs
@@ -112,14 +112,17 @@ namespace umbraco
                 foreach (var attributeValueItem in attributeValueSplit)
                 {
                     attributeValue = attributeValueItem;
+                    var trimmedValue = attributeValue.Trim();
 
                     // Check for special variables (always in square-brackets like [name])
-                    if (attributeValueItem.StartsWith("[") &&
-                        attributeValueItem.EndsWith("]"))
+                    if (trimmedValue.StartsWith("[") &&
+                        trimmedValue.EndsWith("]"))
                     {
+                        attributeValue = trimmedValue;
+
                         // find key name
-                        var keyName = attributeValueItem.Substring(2, attributeValueItem.Length - 3);
-                        var keyType = attributeValueItem.Substring(1, 1);
+                        var keyName = attributeValue.Substring(2, attributeValue.Length - 3);
+                        var keyType = attributeValue.Substring(1, 1);
 
                         switch (keyType)
                         {

From 63af822bad54ab6258768dfec79393153c3b72f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Asbj=C3=B8rn=20Riis-Knudsen?= <asbjoern@stentebjerg.net>
Date: Thu, 29 Oct 2015 14:52:18 +0100
Subject: [PATCH 02/68] U4-6657: Use flexbox for mediapicker search field and
 upload button to allow button to scale for different translations

---
 src/Umbraco.Web.UI.Client/src/less/panel.less  | 17 +++++++++++++++++
 .../src/views/common/dialogs/mediapicker.html  | 18 ++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index f86ba46f59..82c272564a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -42,6 +42,23 @@
     bottom: 90px;
 }
 
+.umb-mediapicker-upload {
+    display: -ms-flexbox;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: flex;
+
+    .form-search {
+        -ms-flex: 1;
+        -webkit-flex: 1;
+        flex: 1;
+    }
+
+    .upload-button {
+        margin-left: 16px;
+    }
+}
+
 .umb-panel.editor-breadcrumb .umb-panel-body, .umb-panel.editor-breadcrumb .umb-bottom-bar {
     bottom: 31px !important;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
index 597dcdaa4b..1594de0e12 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
@@ -62,18 +62,16 @@
     <div class="umb-panel umb-dialogs-mediapicker browser" ng-hide="target" ng-style="{opacity: dropping == true ? '0.25' : '1.0'}">
         <div class="umb-panel-header">
 
-            <div class="umb-el-wrap umb-panel-buttons">
-                <div class="span5">
-                    <div class="form-search">
-                        <i class="icon-search"></i>
-                        <input type="text"
-                               ng-model="searchTerm"
-                               class="umb-search-field search-query"
-                               placeholder="Filter...">
-                    </div>
+            <div class="umb-el-wrap umb-panel-buttons umb-mediapicker-upload">
+                <div class="form-search">
+                    <i class="icon-search"></i>
+                    <input type="text"
+                            ng-model="searchTerm"
+                            class="umb-search-field search-query"
+                            placeholder="Filter...">
                 </div>
 
-                <div class="pull-right">
+                <div class="upload-button">
                     <span class="btn fileinput-button" ng-class="{disabled: disabled}">
                         <i class="icon-page-up"></i>
                         <input type="file" name="files[]" multiple ng-disabled="disabled" class="uploader">

From bd69820028a880cce8c060d088fe4d557a82a056 Mon Sep 17 00:00:00 2001
From: Benas Brazdziunas <b.brazdziunas@gmail.com>
Date: Thu, 29 Oct 2015 16:29:33 +0000
Subject: [PATCH 03/68] Member Picker search results doesn't show correct icons

---
 src/Umbraco.Core/Services/EntityXmlSerializer.cs | 2 ++
 src/UmbracoExamine/UmbracoMemberIndexer.cs       | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/Umbraco.Core/Services/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
index 772009e89a..712f98aeb2 100644
--- a/src/Umbraco.Core/Services/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/EntityXmlSerializer.cs
@@ -100,6 +100,8 @@ namespace Umbraco.Core.Services
 
             xml.Add(new XAttribute("loginName", member.Username));
             xml.Add(new XAttribute("email", member.Email));
+            
+            xml.Add(new XAttribute("icon", member.ContentType.Icon));
 
             return xml;
         }
diff --git a/src/UmbracoExamine/UmbracoMemberIndexer.cs b/src/UmbracoExamine/UmbracoMemberIndexer.cs
index c93172b9a1..873391da50 100644
--- a/src/UmbracoExamine/UmbracoMemberIndexer.cs
+++ b/src/UmbracoExamine/UmbracoMemberIndexer.cs
@@ -207,6 +207,9 @@ namespace UmbracoExamine
                 if (e.Fields.ContainsKey("_searchEmail") == false)
                     e.Fields.Add("_searchEmail", e.Node.Attribute("email").Value.Replace(".", " ").Replace("@", " "));
             }
+            
+            if (e.Fields.ContainsKey(IconFieldName) == false)
+                e.Fields.Add(IconFieldName, (string)e.Node.Attribute("icon"));
         }
 
         private static XElement GetMemberItem(int nodeId)

From 5749f80a7fbfb574735f20b3b43df9be8794f2c8 Mon Sep 17 00:00:00 2001
From: andydale1982 <adale1982@hotmail.com>
Date: Thu, 29 Oct 2015 17:10:39 +0000
Subject: [PATCH 04/68] Added instructions to manually install node_modules.

---
 src/Umbraco.Web.UI/Umbraco/js/install.loader.js   | 11 +++++++++--
 .../umbraco/Install/Views/Index.cshtml            | 15 ++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco/js/install.loader.js b/src/Umbraco.Web.UI/Umbraco/js/install.loader.js
index 869521ec7d..f61c9d2878 100644
--- a/src/Umbraco.Web.UI/Umbraco/js/install.loader.js
+++ b/src/Umbraco.Web.UI/Umbraco/js/install.loader.js
@@ -1,4 +1,5 @@
-LazyLoad.js( [
+try {
+    LazyLoad.js([
       'lib/jquery/jquery.min.js',
       /* 1.1.5 */
       'lib/angular/1.1.5/angular.min.js',
@@ -13,5 +14,11 @@ LazyLoad.js( [
         jQuery(document).ready(function () {
             angular.bootstrap(document, ['ngSanitize', 'umbraco.install', 'umbraco.directives.validation']);
         });
+    });
+}
+catch (err) {
+    if (err.message == 'LazyLoad is not defined') {
+        document.getElementById("feedback").style.display = "none";
+        document.getElementById("missinglazyload").style.display = "block";
     }
-);
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml
index 8171aad9e2..f0cb808264 100644
--- a/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml
@@ -45,7 +45,20 @@
         <p ng-bind-html-unsafe="installer.fact"></p>
     </div>
     
-    <h3 ng-cloak ng-animate="'fade'" id="feedback" ng-show="installer.feedback">{{installer.feedback}}</h3>     
+    <h3 ng-cloak ng-animate="'fade'" id="feedback" ng-show="installer.feedback">{{installer.feedback}}</h3> 
+   
+    <div id="missinglazyload" style="display: none;">
+        <h3>There has been a problem with the build.</h3> 
+        <p>This might be because you could be offline or on a slow connestion. Please try the following steps</p>
+        <ol>
+            <li>Make sure you have <a href="https://nodejs.org" target="_blank">Node.js</a> installed.</li>
+            <li>Open command prompt and cd to \src\Umbraco.Web.UI.Client.</li>
+            <li>Check to see if \src\Umbraco.Web.UI.Client\node_modules folder exists (this could be hidden); if so delete it.</li>
+            <li>Run npm install; if successfull the node_modules folder should be created in the Umbraco.Web.UI.Client directory.</li>
+            <li>Run build\Build.bat.</li>
+        </ol>
+    </div>
+
     <script type="text/javascript">
         var Umbraco = {};
         Umbraco.Sys = {};

From c8cb5b26b0e7b592a044c973f81914c2096bc506 Mon Sep 17 00:00:00 2001
From: Jeavon Leopold <jeavon@crumpled-dog.com>
Date: Thu, 29 Oct 2015 17:14:45 +0000
Subject: [PATCH 05/68] Basic implementation for U4-4641 Feature Request: 
 template and code editors should have insert Section, Define section buttons

---
 .../dialogs/template/snippet.controller.js    |   7 +++
 .../common/dialogs/template/snippet.html      |  39 +++++++++++++++
 .../Umbraco/Images/editor/renderbody.gif      | Bin 0 -> 1336 bytes
 .../umbraco/settings/views/EditView.aspx.cs   |  46 ++++++++++--------
 .../umbraco_client/Editors/EditView.js        |  35 +++++++++++++
 5 files changed, 106 insertions(+), 21 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
 create mode 100644 src/Umbraco.Web.UI/Umbraco/Images/editor/renderbody.gif

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js
new file mode 100644
index 0000000000..dc0f2bead1
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js
@@ -0,0 +1,7 @@
+angular.module("umbraco").controller('Umbraco.Dialogs.Template.SnippetController',
+		function($scope, $http, dialogService) {
+		    $scope.type = $scope.dialogOptions.type;
+		    $scope.section = {};
+		    $scope.section.name = "";
+		    $scope.section.required = false;          
+		});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
new file mode 100644
index 0000000000..1414a7471c
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
@@ -0,0 +1,39 @@
+<form novalidate name="contentForm"
+    ng-controller="Umbraco.Dialogs.Template.SnippetController"
+    ng-submit="close()"
+    val-form-manager>
+	
+	<style>
+
+	</style>
+
+	<div class="umb-panel">
+
+		<div class="umb-panel-header">
+		    <h1 class="headline" style="margin: 10px 0 0 0">Configure the section</h1>
+		</div>
+
+	    <div class="umb-panel-body with-footer umb-querybuilder">
+            <label>
+                Section name:
+                <input type="text" ng-model="section.name" />
+            </label>
+            <label ng-show="type === 'rendersection'">
+                Required?
+                <input type="checkbox" ng-checked="section.required" ng-model="section.required" />
+            </label>
+	    </div>	
+
+		<div class="umb-panel-footer" >
+			<div class="umb-el-wrap umb-panel-buttons">
+		        <div class="btn-toolbar umb-btn-toolbar pull-right">
+		            <a href ng-click="close()" class="btn btn-link">
+		                <localize key="general_close">Close</localize>
+		            </a>
+                    
+                    <a href ng-click="submit(section)" class="btn btn-primary">Insert</a>
+		        </div>
+	      </div>
+		</div>
+	</div>
+</form>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/Images/editor/renderbody.gif b/src/Umbraco.Web.UI/Umbraco/Images/editor/renderbody.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1a84493fe9d7668b782aee1e352f12970cc4bff2
GIT binary patch
literal 1336
zcmZ?wbhEHb6k`x)I3mVy?Ha?)n+&gCGd_F9@c1#qrArL&-Z8&?$?*9z@7=o$4<0al
z{K)?2&)+})|Ni)4@axat&tDCG{0jT^E9}possI1~Wnf_V|NlRb#03=pb4U0FD7Yk+
zBm!w0`-+0Z<m}WEg{0K<%sgAA_q+EiDP*SDDutW+8u%7Cr)Fe&R28KLSNVk`S7j$#
zrYPClDcDq4Rpb`rrj{fsROII56<bx<DkY}mC#6~e*&tzkB?YjOl5ATgN05X9$WG_{
zqErP_Jp<ij12Y2!GebQ?V-s_8a~%aE149FS10#JyBV9vtD`O)o0|NypPy*Ukl#*r@
z<l+Xk3&^uo$|xx*u+rBrFE7_CH`dE9O4m2Ew6p}7VPvEWRH0j3nOBlnp_^B%3^Tzc
zwK%ybv!En1KTiQ<Vq#K$X^E{8(4`PB<QBk<%`4Uedq*!hKUcpZu|VHY&j92lm_lD)
z{7Q3k;i`*Ef>IIg#cFVINM%8)eo$(0erZv1Dp0vH$f^P>=c3falKi5O{QMkPC<bKY
zm*f{`<QFJ72b(H{XXd5kmluOo`}$gW<`tJD<|U_ky4WfK_3LG3rdXLf8e6!zy1JOV
z8XFlJx|%u}T3R?689G`zI-8rhTAIW3y5uL9=BDPA!1Sgd^t$5I3rYyN1wfl!Qj0Rn
zQd8WD@^cly9=6KF?G`7T=0WwQ;C72MPQCg-$LNEi6)BowLcp{GV!{(GkONQlsd>P(
zUIa|kjQ{`r{qy_R&mZ5vef{$J)5j0*-@SeF`qj%9&!0Vg^7zri2lwyYy>t84%^TOR
zUA=Po(!~qs&z(JU`qar2$B!L7a`@1}1N-;w-Lrew&K=vgZQZhY)5Z<!*R5T%dezDm
z%a<)(vUt(L1@q_4oilsZ%o)?CO`S4%(!>e<eZ4*1U7a26ZLKZMO^prpb+t9sRh1Rx
zWu+y>MTG_VdAT{+S(zE>X{jm6Nr?&Zaj`McQIQehVWA<xL4g7Oe!f25UY;KAZmurQ
zPL2-tcD6RwR+bj#W~L^<$TrZ|)78<|($r8_Q&mw`QdE$ala-N{l9Uh^6BQ8_5)|O)
z<K^Mz;^bgwV`X7xVq{=Y{K*0&#TaxzMF*%fVql%UK(#L=b6&=(bt+9d-H9BB3VD7s
zDuulNKDjf+$U#?w$?1SNk5ZR9Gi!meh7hBJW0S%H7JIJ(jfpyY)C<-h%G)j)&vh_h
zVvDNikCzN<0{&#zb80XbF*Ve6G^;cFHq_hliZW`j2p4zM^VUyM=St=4wB-@y7iG}k
pa;gwq%)>9RT!WL(IBz?v24h5IWK<OEL7l@#jvhOHLQ|2!8UO^^-|_$e

literal 0
HcmV?d00001

diff --git a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
index cd739711fb..c08e4ba48c 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/settings/views/EditView.aspx.cs
@@ -248,29 +248,33 @@ namespace Umbraco.Web.UI.Umbraco.Settings.Views
 		/// </summary>
 		private void InitializeEditorForTemplate()
 		{
-			
-			//TODO: implement content placeholders, etc... just like we had in v5
 
-			//Panel1.Menu.InsertSplitter();
+            //TODO: implement content placeholders, etc... just like we had in v5
 
-			//MenuIconI umbContainer = Panel1.Menu.NewIcon();
-			//umbContainer.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
-			//umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
-			//umbContainer.OnClickCommand =
-			//	ClientTools.Scripts.OpenModalWindow(
-			//		IOHelper.ResolveUrl(SystemDirectories.Umbraco) +
-			//		"/dialogs/insertMasterpagePlaceholder.aspx?&id=" + _template.Id,
-			//		ui.Text("template", "insertContentAreaPlaceHolder"), 470, 320);
+            editorSource.Menu.InsertSplitter();
 
-			//MenuIconI umbContent = Panel1.Menu.NewIcon();
-			//umbContent.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
-			//umbContent.AltText = ui.Text("template", "insertContentArea");
-			//umbContent.OnClickCommand =
-			//	ClientTools.Scripts.OpenModalWindow(
-			//		IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "/dialogs/insertMasterpageContent.aspx?id=" +
-			//		_template.Id, ui.Text("template", "insertContentArea"), 470, 300);
-			
-		}
+            MenuIconI umbRenderBody = editorSource.Menu.NewIcon();
+            umbRenderBody.ImageURL = UmbracoPath + "/images/editor/renderbody.gif";
+            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
+            umbRenderBody.AltText = "Insert @RenderBody()";
 
-	}
+            umbRenderBody.OnClickCommand = "editViewEditor.insertRenderBody()";
+
+            MenuIconI umbSection = editorSource.Menu.NewIcon();
+            umbSection.ImageURL = UmbracoPath + "/images/editor/masterpagePlaceHolder.gif";
+            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
+            umbSection.AltText = "Insert Section";
+
+            umbSection.OnClickCommand = "editViewEditor.openSnippetModal('section')";
+
+            MenuIconI umbRenderSection = editorSource.Menu.NewIcon();
+            umbRenderSection.ImageURL = UmbracoPath + "/images/editor/masterpageContent.gif";
+            //umbContainer.AltText = ui.Text("template", "insertContentAreaPlaceHolder");
+            umbRenderSection.AltText = "Insert @RenderSection";
+
+            umbRenderSection.OnClickCommand = "editViewEditor.openSnippetModal('rendersection')";
+
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
index 00fda4db21..00c5b488e7 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
@@ -36,6 +36,10 @@
             
             UmbEditor.Insert("@Umbraco.RenderMacro(\"" + alias + "\")", "", this._opts.codeEditorElementId);
         },
+
+        insertRenderBody: function() {
+            UmbEditor.Insert("@RenderBody()", "", this._opts.codeEditorElementId);
+        },
         
         openMacroModal: function (alias) {
             /// <summary>callback used to display the modal dialog to insert a macro with parameters</summary>
@@ -54,6 +58,37 @@
             });
         },
 
+        openSnippetModal: function (type) {
+            /// <summary>callback used to display the modal dialog to insert a macro with parameters</summary>
+
+            var self = this;
+
+            UmbClientMgr.openAngularModalWindow({
+                template: "views/common/dialogs/template/snippet.html",
+                callback: function (data) {
+
+                    var code = "";
+
+                    if (type === 'section') {
+                        code = "\n@section " + data.name + "{\n";
+                        code += "<!-- Content here -->\n" +
+                            "}\n";
+                    }
+
+                    if (type === 'rendersection') {
+                        if (data.required) {
+                            code = "\n@RenderSection(\"" + data.name + "\", true);\n";
+                        } else {
+                            code = "\n@RenderSection(\"" + data.name + "\");\n";
+                        }
+                    }
+
+                    UmbEditor.Insert(code, '', self._opts.codeEditorElementId);
+                },
+                type: type
+            });
+        },
+
 
         openQueryModal: function () {
             /// <summary>callback used to display the modal dialog to insert a macro with parameters</summary>

From 38b13bf6ce41e7312a06f342c8f40d180dc196d1 Mon Sep 17 00:00:00 2001
From: Jeavon Leopold <jeavon@crumpled-dog.com>
Date: Thu, 29 Oct 2015 17:18:40 +0000
Subject: [PATCH 06/68] Basic implementation for U4-4641

---
 src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
index 00c5b488e7..509de8ed28 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Editors/EditView.js
@@ -79,7 +79,7 @@
                         if (data.required) {
                             code = "\n@RenderSection(\"" + data.name + "\", true);\n";
                         } else {
-                            code = "\n@RenderSection(\"" + data.name + "\");\n";
+                            code = "\n@RenderSection(\"" + data.name + "\" false);\n";
                         }
                     }
 

From a7f06ebc56fc8cf5a0aff2ac182cacb5fe746770 Mon Sep 17 00:00:00 2001
From: andydale1982 <andy.dale@ED-DEV06.Emperor.local>
Date: Fri, 30 Oct 2015 10:38:05 +0000
Subject: [PATCH 07/68] Typo Correction

---
 src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml
index f0cb808264..666f6a5b5a 100644
--- a/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml
@@ -49,7 +49,7 @@
    
     <div id="missinglazyload" style="display: none;">
         <h3>There has been a problem with the build.</h3> 
-        <p>This might be because you could be offline or on a slow connestion. Please try the following steps</p>
+        <p>This might be because you could be offline or on a slow connection. Please try the following steps</p>
         <ol>
             <li>Make sure you have <a href="https://nodejs.org" target="_blank">Node.js</a> installed.</li>
             <li>Open command prompt and cd to \src\Umbraco.Web.UI.Client.</li>

From 36a1c0a9e0985fa723a8772d33bf619ce6fbc636 Mon Sep 17 00:00:00 2001
From: Wincent <david.wincent@gmail.com>
Date: Sat, 31 Oct 2015 16:29:02 +0100
Subject: [PATCH 08/68] Changed web api GetBigThumbnail to image processor in
 mediahelper.service.js and fileupload.controller.js

---
 .../src/common/services/mediahelper.service.js       | 10 ++--------
 .../fileupload/fileupload.controller.js              | 12 ++++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index 68ca32efbc..c245b99963 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -303,14 +303,8 @@ function mediaHelper(umbRequestHelper) {
                 return null;
             }
 
-            //get the proxy url for big thumbnails (this ensures one is always generated)
-            var thumbnailUrl = umbRequestHelper.getApiUrl(
-                "imagesApiBaseUrl",
-                "GetBigThumbnail",
-                [{ originalImagePath: imagePath }]);
-
-            //var ext = imagePath.substr(imagePath.lastIndexOf('.'));
-            //return imagePath.substr(0, imagePath.lastIndexOf('.')) + "_big-thumb" + ".jpg";
+            //get default big thumbnail from image processor
+            var thumbnailUrl = imagePath + "?width=500";
 
             return thumbnailUrl;
         },
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index 37dea64c21..6571acd866 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -63,10 +63,8 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag
 
         _.each($scope.persistedFiles, function (file) {
 
-            var thumbnailUrl = umbRequestHelper.getApiUrl(
-                        "imagesApiBaseUrl",
-                        "GetBigThumbnail",
-                        [{ originalImagePath: file.file }]);
+            //get default big thumbnail from image processor
+            var thumbnailUrl = file.file + "?width=500";
 
             file.thumbnail = thumbnailUrl;
         });
@@ -154,10 +152,8 @@ angular.module("umbraco")
 
                     if (mediaHelper.detectIfImageByExtension(property.value)) {
 
-                        var thumbnailUrl = umbRequestHelper.getApiUrl(
-                            "imagesApiBaseUrl",
-                            "GetBigThumbnail",
-                            [{ originalImagePath: property.value }]);
+                        //get default big thumbnail from image processor
+                        var thumbnailUrl = property.value + "?width=500";
                             
                         return thumbnailUrl;
                     }

From 15c9aadcdc912c7ba64abdd16efc00788caa4d2c Mon Sep 17 00:00:00 2001
From: Nicholas-Westby <nicholas.westby@rhythmagency.com>
Date: Sun, 1 Nov 2015 22:43:27 -0800
Subject: [PATCH 09/68] Partial implementation of detailed node info:
 http://issues.umbraco.org/issue/U4-5764

---
 .../contentpicker/contentpicker.controller.js       | 13 ++++++++++++-
 .../contentpicker/contentpicker.html                |  6 ++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 48f4ed5bda..91c128cc97 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 
-function contentPickerController($scope, dialogService, entityResource, editorState, $log, iconHelper, $routeParams, fileManager, contentEditingHelper) {
+function contentPickerController($scope, dialogService, entityResource, editorState, $log, iconHelper, $routeParams, fileManager, contentEditingHelper, contentResource, navigationService) {
 
     function trim(str, chr) {
         var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
@@ -142,6 +142,17 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
     $scope.remove = function (index) {
         $scope.renderModel.splice(index, 1);
     };
+
+    $scope.showNode = function (index) {
+        var item = $scope.renderModel[index];
+        var id = item.id;
+        contentResource
+            .getById(id)
+            .then(function (data) {
+                navigationService.syncTree({ tree: "content", path: data.path, forceReload: false, activate: true });
+                //TODO: Need to load node too: https://our.umbraco.org/forum/developers/api-questions/72584-programmatically-load-content-node-in-back-office
+            });
+    }
         
     $scope.add = function (item) {
         var currIds = _.map($scope.renderModel, function (i) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index c5de0a69db..8f223bf132 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -15,8 +15,10 @@
                     <i class="{{node.icon}} hover-hide"></i> 
                     {{node.name}}
                 </a>
-                <div ng-if="!dialogEditor && model.config.showEditButton">
-                    <small><a href umb-launch-mini-editor="node"><localize key="edit">Edit</localize></a></small>
+                
+                <div ng-if="!dialogEditor">
+                    <small><a href ng-click="showNode($index)"><localize key="view">View</localize></a></small>
+                    <small ng-if="model.config.showEditButton"><a href umb-launch-mini-editor="node"><localize key="edit">Edit</localize></a></small>
                 </div>
             </li>
         </ul>

From a9ad0ae8eb4f6bd6250b859646159e6cb775c68c Mon Sep 17 00:00:00 2001
From: Daniel <daniel@andreasen.it>
Date: Mon, 2 Nov 2015 23:34:33 +0100
Subject: [PATCH 10/68] removed the debug check

---
 src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
index a67fb5cb99..d920d4509c 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -202,10 +202,9 @@ namespace Umbraco.Web.Models.Mapping
                 genericProperties =>
                 {
                     //TODO: This would be much nicer with the IUmbracoContextAccessor so we don't use singletons
-                    //If this is a web request and debugging is enabled and there's a user signed in and the 
-                    // user has access tot he settings section, we will 
-                    if (HttpContext.Current != null && HttpContext.Current.IsDebuggingEnabled
-                        && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
+                    //If this is a web request and there's a user signed in and the 
+                    // user has access to the settings section, we will 
+                    if (HttpContext.Current != null && UmbracoContext.Current != null && UmbracoContext.Current.Security.CurrentUser != null
                         && UmbracoContext.Current.Security.CurrentUser.AllowedSections.Any(x => x.Equals(Constants.Applications.Settings)))
                     {
                         var currentDocumentType = contentTypeService.GetContentType(display.ContentTypeAlias);

From e5d7f6fd04f0177dda5bbb2ef0e9b28de63bb910 Mon Sep 17 00:00:00 2001
From: Nicholas-Westby <nicholas.westby@rhythmagency.com>
Date: Tue, 3 Nov 2015 22:39:36 -0800
Subject: [PATCH 11/68] Partial implementation of detailed node info (show node
 in "view" is clicked): http://issues.umbraco.org/issue/U4-5764

---
 .../contentpicker/contentpicker.controller.js                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 91c128cc97..da8d8f9a82 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -1,7 +1,7 @@
 //this controller simply tells the dialogs service to open a mediaPicker window
 //with a specified callback, this callback will receive an object with a selection on it
 
-function contentPickerController($scope, dialogService, entityResource, editorState, $log, iconHelper, $routeParams, fileManager, contentEditingHelper, contentResource, navigationService) {
+function contentPickerController($location, $scope, dialogService, entityResource, editorState, $log, iconHelper, $routeParams, fileManager, contentEditingHelper, contentResource, navigationService) {
 
     function trim(str, chr) {
         var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
@@ -150,7 +150,8 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
             .getById(id)
             .then(function (data) {
                 navigationService.syncTree({ tree: "content", path: data.path, forceReload: false, activate: true });
-                //TODO: Need to load node too: https://our.umbraco.org/forum/developers/api-questions/72584-programmatically-load-content-node-in-back-office
+                var routePath = "content/content/edit/" + id.toString();
+                $location.path(routePath).search("");
             });
     }
         

From 5ed4f262cd6943845a41d5dfcb856aad03d5c9d7 Mon Sep 17 00:00:00 2001
From: Nicholas-Westby <nicholas.westby@rhythmagency.com>
Date: Wed, 4 Nov 2015 22:25:37 -0800
Subject: [PATCH 12/68] Partial implementation of detailed node info (changed
 button text to "Open" and styled a bit):
 http://issues.umbraco.org/issue/U4-5764

---
 .../src/less/property-editors.less                     | 10 +++++++++-
 src/Umbraco.Web.UI.Client/src/less/variables.less      |  1 +
 .../propertyeditors/contentpicker/contentpicker.html   |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index be6b1d7b06..19830800a5 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -40,8 +40,16 @@
   padding: 10px;
 }
 
-.umb-contentpicker small a {
+.umb-contentpicker small {
+
+  &:not(:last-child) {
+    padding-right: 3px;
+    border-right: 1px solid @grayMed;
+  }
+
+  a {
     color: @gray;
+  }
 }
 
 /* CODEMIRROR DATATYPE */
diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
index ec73e62c0c..f002566eed 100644
--- a/src/Umbraco.Web.UI.Client/src/less/variables.less
+++ b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -14,6 +14,7 @@
 @grayDarker:            #222;
 @grayDark:              #343434;
 @gray:                  #555;
+@grayMed:               #999;
 @grayLight:             #d9d9d9;
 @grayLighter:           #f8f8f8;
 @white:                 #fff; 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 8f223bf132..795afddb7d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -17,7 +17,7 @@
                 </a>
                 
                 <div ng-if="!dialogEditor">
-                    <small><a href ng-click="showNode($index)"><localize key="view">View</localize></a></small>
+                    <small><a href ng-click="showNode($index)"><localize key="open">Open</localize></a></small>
                     <small ng-if="model.config.showEditButton"><a href umb-launch-mini-editor="node"><localize key="edit">Edit</localize></a></small>
                 </div>
             </li>

From 82f6b6a66d55c189e4963b639b1104e271197a1c Mon Sep 17 00:00:00 2001
From: bjarnef <bjarne_fyrstenborg@hotmail.com>
Date: Sat, 7 Nov 2015 23:53:35 +0100
Subject: [PATCH 13/68] Add ngCapsLock

---
 src/Umbraco.Web.UI.Client/src/app.dev.js                      | 1 +
 src/Umbraco.Web.UI.Client/src/app.js                          | 1 +
 src/Umbraco.Web.UI.Client/src/loader.dev.js                   | 4 +++-
 src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/app.dev.js b/src/Umbraco.Web.UI.Client/src/app.dev.js
index e4ce285755..e9ad8777d7 100644
--- a/src/Umbraco.Web.UI.Client/src/app.dev.js
+++ b/src/Umbraco.Web.UI.Client/src/app.dev.js
@@ -7,6 +7,7 @@ var app = angular.module('umbraco', [
     'ngCookies',
     'ngMobile',
     'ngSanitize',
+    'ngCapsLock',
     /*'ui.sortable',*/
     'blueimp.fileupload',
     'tmh.dynamicLocale'
diff --git a/src/Umbraco.Web.UI.Client/src/app.js b/src/Umbraco.Web.UI.Client/src/app.js
index c541e0776c..70968936c5 100644
--- a/src/Umbraco.Web.UI.Client/src/app.js
+++ b/src/Umbraco.Web.UI.Client/src/app.js
@@ -7,6 +7,7 @@ var app = angular.module('umbraco', [
     'ngCookies',
     'ngSanitize',
     'ngMobile',
+    'ngCapsLock',
     'blueimp.fileupload',
     'tmh.dynamicLocale'
 ]);
diff --git a/src/Umbraco.Web.UI.Client/src/loader.dev.js b/src/Umbraco.Web.UI.Client/src/loader.dev.js
index 2be6593238..87319d751f 100644
--- a/src/Umbraco.Web.UI.Client/src/loader.dev.js
+++ b/src/Umbraco.Web.UI.Client/src/loader.dev.js
@@ -10,7 +10,9 @@ LazyLoad.js(
         'lib/angular/1.1.5/angular-mobile.js',
         'lib/angular/1.1.5/angular-sanitize.min.js',
 
-        'lib/angular/angular-ui-sortable.js',
+        'lib/angular/ng-caps-lock.js',
+
+        'lib/ngCapsLock/angular-ui-sortable.js',
 
         'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
index 94826b07b4..e1cc008551 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
@@ -41,6 +41,7 @@
 
                 <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
                     <input type="password" ng-model="password" name="password" class="input-xlarge" localize="placeholder" placeholder="@placeholders_password" autocomplete="off" />
+                    <p class="caps-lock-alert" ng-show="isCapsLockOn"><i class="icon-alert"></i> Caps lock is on</p>
                 </div>
 
                 <button type="submit" class="btn" val-trigger-change="#login .form input"><localize key="general_login">Login</localize></button>

From 58132028928b5b94fb8a32d41634d1fba159c4b1 Mon Sep 17 00:00:00 2001
From: Nicholas-Westby <nicholas.westby@rhythmagency.com>
Date: Sat, 7 Nov 2015 23:51:07 -0800
Subject: [PATCH 14/68] Finished implementation of detailed node info (added
 breadcrumb to content dialog): http://issues.umbraco.org/issue/U4-5764 Also
 moved the breadcrumb into a directive since it was used in multiple places.

---
 .../directives/umbbreadcrumbnav.directive.js  | 52 +++++++++++++++++++
 src/Umbraco.Web.UI.Client/src/less/panel.less | 10 ++++
 .../common/dialogs/content/edit.controller.js |  6 +++
 .../views/common/dialogs/content/edit.html    |  7 ++-
 .../views/content/content.edit.controller.js  | 10 ++--
 .../src/views/content/edit.html               |  7 +--
 .../views/directives/umb-breadcrumb-nav.html  |  6 +++
 .../src/views/media/edit.html                 |  8 +--
 .../src/views/media/media.edit.controller.js  |  8 ---
 9 files changed, 85 insertions(+), 29 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/common/directives/umbbreadcrumbnav.directive.js
 create mode 100644 src/Umbraco.Web.UI.Client/src/views/directives/umb-breadcrumb-nav.html

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbbreadcrumbnav.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbbreadcrumbnav.directive.js
new file mode 100644
index 0000000000..944fe48e30
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbbreadcrumbnav.directive.js
@@ -0,0 +1,52 @@
+/**
+ * @ngdoc directive
+ * @name umbraco.directives.directive:umbBreadcrumbNav
+ * @function
+ * @description
+ * A breadcrumb navigation directive that shows linked ancestors.
+ * 
+ * @restrict E
+ */
+function breadcrumbNavDirective(entityResource, $compile) {
+
+    // Workaround since ng-if won't work at the root level of the directive.
+    function useEmptyMarkup(scope, element) {
+        var newElement = $compile("")(scope);
+        element.replaceWith(newElement);
+    }
+
+    return {
+        restrict: "E", // restrict to an element
+        replace: true,//TODO: Restore comment.
+        templateUrl: 'views/directives/umb-breadcrumb-nav.html',
+        scope: {
+            nodeId: '=',
+            kind: '=' // Kind can be "content" or "media".
+        },
+        link: function (scope, element, attrs, ctrl) {
+
+            // Fetch all ancestors.
+            var entityType = scope.kind === "content" ? "document" : "media";
+            if (scope.nodeId) {
+                entityResource
+                    .getAncestors(scope.nodeId, entityType)
+                    .then(function (anc) {
+                        if (anc && anc.length > 1) {
+                            scope.ancestors = anc;
+                        } else {
+                            useEmptyMarkup(scope, element);
+                        }
+                    });
+            } else {
+                useEmptyMarkup(scope, element);
+            }
+
+            // Set path for editing the entity.
+            scope.editBasePath = "#/" + scope.kind + "/" + scope.kind + "/edit/";
+
+        }
+    };
+
+}
+
+angular.module('umbraco.directives').directive("umbBreadcrumbNav", breadcrumbNavDirective);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index f86ba46f59..b214f190a4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -41,6 +41,9 @@
 .umb-panel-body.with-footer {
     bottom: 90px;
 }
+.umb-panel-body.with-footer-and-breadcrumb {
+    bottom: 121px;
+}
 
 .umb-panel.editor-breadcrumb .umb-panel-body, .umb-panel.editor-breadcrumb .umb-bottom-bar {
     bottom: 31px !important;
@@ -145,6 +148,13 @@
     right: 0px;
 }
 
+// Adjust vertical layout to fit a breadcrumb in the footer.
+.umb-modal .umb-panel-footer.containing-breadcrumb .umb-panel-buttons {
+    // Forces the element to have a height.
+    overflow: hidden;
+    margin-bottom: 31px;
+}
+
 
 /* Publish */
 .umb-btn-toolbar .dropdown-menu {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js
index 04e926742f..5a34dc32c3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js
@@ -51,6 +51,12 @@ function ContentEditDialogController($scope, editorState, $routeParams, $q, $tim
         $scope.content.isDialogEditor = true;
 
         editorState.set($scope.content);
+
+        // Don't show the footer breadcrumb if this content is being created.
+        if (!$routeParams.create) {
+            $scope.showBreadcrumb = true;
+        }
+
     }
 
     //check if the entity is being passed in, otherwise load it from the server
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.html
index 55e0cad2e7..811f189702 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.html
@@ -11,7 +11,7 @@
 			    ng-model="content.name"/>
 		</div>
 
-		<div class="umb-panel-body with-footer">
+		<div class="umb-panel-body with-footer-and-breadcrumb">
             <div id="tab{{tab.id}}" ng-repeat="tab in content.tabs">
                 <div class="umb-pane" ng-if="!tab.hide">
                     <h5>{{tab.label}}</h5>
@@ -24,7 +24,7 @@
 		</div>
 
 
-		<div class="umb-panel-footer" >
+		<div class="umb-panel-footer containing-breadcrumb">
 			<div class="umb-el-wrap umb-panel-buttons">
 		        <div class="btn-toolbar umb-btn-toolbar pull-right">
 		        	<a href ng-click="close()" class="btn btn-link">
@@ -55,6 +55,9 @@
 		        </div>
 
 		      </div>
+
+              <umb-breadcrumb-nav class="umb-panel-footer-nav nav nav-pills" node-id="content.id" kind="'content'" ng-if="showBreadcrumb"></umb-breadcrumb-nav>
+
 			</div>
 		</div>
 	</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
index 03de8af21e..80d3675993 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
@@ -32,15 +32,11 @@ function ContentEditController($scope, $rootScope, $routeParams, $q, $timeout, $
 
         editorState.set($scope.content);
 
-        //We fetch all ancestors of the node to generate the footer breadcrumb navigation
+        // Don't show the footer breadcrumb if this content is being created.
         if (!$routeParams.create) {
-            if (content.parentId && content.parentId != -1) {
-                entityResource.getAncestors(content.id, "document")
-               .then(function (anc) {
-                   $scope.ancestors = anc;
-               });
-            }
+            $scope.showBreadcrumb = true;
         }
+
     }
 
     /** Syncs the content item to it's tree node - this occurs on first load and after saving */
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index d6050dbcb1..5c90baa945 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -78,12 +78,7 @@
         </umb-tab-view>
 
 
-        <ul class="umb-panel-footer-nav nav nav-pills" ng-if="ancestors && ancestors.length > 0">
-            <li ng-repeat="ancestor in ancestors">
-                <a href="#/content/content/edit/{{ancestor.id}}">{{ancestor.name}}</a>
-            </li>
-            <li></li>
-        </ul>
+        <umb-breadcrumb-nav class="umb-panel-footer-nav nav nav-pills" node-id="content.id" kind="'content'" ng-if="showBreadcrumb"></umb-breadcrumb-nav>
 
     </umb-panel>
 </form>
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-breadcrumb-nav.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-breadcrumb-nav.html
new file mode 100644
index 0000000000..e22226fa01
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-breadcrumb-nav.html
@@ -0,0 +1,6 @@
+<ul>
+    <li ng-repeat="ancestor in ancestors">
+        <a href="{{editBasePath}}{{ancestor.id}}">{{ancestor.name}}</a>
+    </li>
+    <li></li>
+</ul>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
index f131b35e5b..33622115e8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html
@@ -54,11 +54,7 @@
             </umb-tab>
         </umb-tab-view>
 
-        <ul class="umb-panel-footer-nav nav nav-pills" ng-if="ancestors && ancestors.length > 0">
-            <li ng-repeat="ancestor in ancestors">
-                <a href="#/media/media/edit/{{ancestor.id}}">{{ancestor.name}}</a>
-            </li>
-            <li></li>
-        </ul>
+        <umb-breadcrumb-nav class="umb-panel-footer-nav nav nav-pills" node-id="content.id" kind="'media'"></umb-breadcrumb-nav>
+
     </umb-panel>
 </form>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
index 0895ded13c..d304585858 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
@@ -66,14 +66,6 @@ function mediaEditController($scope, $routeParams, appState, mediaResource, enti
                 serverValidationManager.executeAndClearAllSubscriptions();
 
                 syncTreeNode($scope.content, data.path, true);
-               
-                if ($scope.content.parentId && $scope.content.parentId != -1) {
-                    //We fetch all ancestors of the node to generate the footer breadcrump navigation
-                    entityResource.getAncestors($routeParams.id, "media")
-                        .then(function (anc) {
-                            $scope.ancestors = anc;
-                        });
-                }
 
             });  
     }

From d15c09ad2af53495e6efc68117a61f77e805453d Mon Sep 17 00:00:00 2001
From: bjarnef <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 9 Nov 2015 00:06:16 +0100
Subject: [PATCH 15/68] Localize "Caps Lock is on"

---
 .../src/views/common/dialogs/login.html                     | 2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml               | 6 +-----
 src/Umbraco.Web.UI/umbraco/config/lang/de.xml               | 3 ++-
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml               | 1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml            | 1 +
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
index e1cc008551..d58f8a2fd3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
@@ -41,7 +41,7 @@
 
                 <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
                     <input type="password" ng-model="password" name="password" class="input-xlarge" localize="placeholder" placeholder="@placeholders_password" autocomplete="off" />
-                    <p class="caps-lock-alert" ng-show="isCapsLockOn"><i class="icon-alert"></i> Caps lock is on</p>
+                    <p class="caps-lock-alert" ng-show="isCapsLockOn"><i class="icon-alert"></i> <localize key="login_capsLockIsOn">Caps Lock is on</localize></p>
                 </div>
 
                 <button type="submit" class="btn" val-trigger-change="#login .form input"><localize key="general_login">Login</localize></button>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index cfcfca042a..c8469fadcc 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -490,7 +490,6 @@
     <key alias="renewSession">Forny for at gemme dine ændringer</key>
   </area>
   <area alias="login">
-
     <key alias="greeting0">Så er det søndag!</key>  
     <key alias="greeting1">Smil, det er mandag!</key>
     <key alias="greeting2">Hurra, det er tirsdag!</key>
@@ -498,12 +497,9 @@
     <key alias="greeting4">Glædelig torsdag!</key>
     <key alias="greeting5">Endelig fredag!</key>
     <key alias="greeting6">Glædelig lørdag</key>
-    
-
     <key alias="instruction">indtast brugernavn og kodeord</key>
     <key alias="timeout">Din session er udløbet</key>
-
-
+    <key alias="capsLockIsOn">Caps Lock er slået til</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index c6f87964e7..2cdbb833ab 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -531,7 +531,8 @@ Wenn Sie sich für Runway entscheiden, können Sie optional Blöcke nutzen, die
     <key alias="greeting6">Wunderbaren sonnigen Samstag</key>
     <key alias="instruction">Hier anmelden:</key>
     <key alias="timeout">Die Sitzung ist abgelaufen</key>
-	<key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="http://umbraco.com" style="text-decoration: none" target="_blank"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
+    <key alias="capsLockIsOn">Caps Lock ist aktiviert</key>
+    <key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="http://umbraco.com" style="text-decoration: none" target="_blank"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
   </area>
   <area alias="main">
     <key alias="dashboard">Armaturenbrett</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 8f493d2582..d5c441da2c 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -561,6 +561,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="greeting6">Happy Caturday</key>
     <key alias="instruction">Log in below</key>
     <key alias="timeout">Session timed out</key>
+    <key alias="capsLockIsOn">Caps Lock is on</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 69c7e605da..66547ed0d4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -562,6 +562,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="greeting6">Happy Caturday</key>
     <key alias="instruction">Log in below</key>
     <key alias="timeout">Session timed out</key>
+    <key alias="capsLockIsOn">Caps Lock is on</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>  
   </area>
   <area alias="main">

From f0e1460550fd78bbbc7730a9c2277b3d3acdbc94 Mon Sep 17 00:00:00 2001
From: bjarnef <bjarne_fyrstenborg@hotmail.com>
Date: Mon, 9 Nov 2015 00:34:34 +0100
Subject: [PATCH 16/68] Update bower.json with ngCapsLock

---
 src/Umbraco.Web.UI.Client/bower.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 9a6b26aeaf..097ea1da66 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -25,6 +25,7 @@
     "jquery-ui": "1.10.3",
     "angular-dynamic-locale": "~0.1.27",
     "tinymce": "~4.1.10",
-    "codemirror": "~5.3.0"
+    "codemirror": "~5.3.0",
+    "ngCapsLock": "~1.0.2"
   }
 }

From f81353af0b9e87e149bc6311b3ed4027f82edbe6 Mon Sep 17 00:00:00 2001
From: Nicholas-Westby <nicholas.westby@rhythmagency.com>
Date: Sun, 8 Nov 2015 17:16:17 -0800
Subject: [PATCH 17/68] Amended last commit for detailed node info (so it plays
 nice when picking media): http://issues.umbraco.org/issue/U4-5764 Also added
 node path to title of "Open" button (so it shows the full path on hover).
 More consistent quoting (namely, using apostrophes rather than double
 quotes).

---
 .../directives/umbbreadcrumbnav.directive.js  | 46 +++++++++++------
 .../contentpicker/contentpicker.controller.js | 49 +++++++++++++++----
 .../contentpicker/contentpicker.html          |  4 +-
 3 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbbreadcrumbnav.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbbreadcrumbnav.directive.js
index 944fe48e30..f9c77c55f2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbbreadcrumbnav.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbbreadcrumbnav.directive.js
@@ -11,13 +11,27 @@ function breadcrumbNavDirective(entityResource, $compile) {
 
     // Workaround since ng-if won't work at the root level of the directive.
     function useEmptyMarkup(scope, element) {
-        var newElement = $compile("")(scope);
+        var newElement = $compile('')(scope);
         element.replaceWith(newElement);
     }
 
+    // Populates the ancestors of the node (inclusive of the node).
+    function populateAncestors(scope, entityType, element) {
+        entityResource
+            .getAncestors(scope.nodeId, entityType)
+            .then(function (anc) {
+                if (anc && anc.length > 1) {
+                    scope.ancestors = anc;
+                } else {
+                    useEmptyMarkup(scope, element);
+                }
+            });
+    }
+
+    // Return directive definition.
     return {
-        restrict: "E", // restrict to an element
-        replace: true,//TODO: Restore comment.
+        restrict: 'E', // restrict to an element
+        replace: true, // replace the html element with the template
         templateUrl: 'views/directives/umb-breadcrumb-nav.html',
         scope: {
             nodeId: '=',
@@ -26,27 +40,27 @@ function breadcrumbNavDirective(entityResource, $compile) {
         link: function (scope, element, attrs, ctrl) {
 
             // Fetch all ancestors.
-            var entityType = scope.kind === "content" ? "document" : "media";
+            var entityType = scope.kind === 'content' ? 'document' : 'media';
             if (scope.nodeId) {
-                entityResource
-                    .getAncestors(scope.nodeId, entityType)
-                    .then(function (anc) {
-                        if (anc && anc.length > 1) {
-                            scope.ancestors = anc;
-                        } else {
-                            useEmptyMarkup(scope, element);
-                        }
-                    });
+                populateAncestors(scope, entityType, element);
             } else {
-                useEmptyMarkup(scope, element);
+
+                // Wait until the node ID is present before searching for ancestors.
+                var unwatch = scope.$watch('nodeId', function (value) {
+                    if (value) {
+                        unwatch();
+                        populateAncestors(scope, entityType, element);
+                    }
+                });
+
             }
 
             // Set path for editing the entity.
-            scope.editBasePath = "#/" + scope.kind + "/" + scope.kind + "/edit/";
+            scope.editBasePath = '#/' + scope.kind + '/' + scope.kind + '/edit/';
 
         }
     };
 
 }
 
-angular.module('umbraco.directives').directive("umbBreadcrumbNav", breadcrumbNavDirective);
\ No newline at end of file
+angular.module('umbraco.directives').directive('umbBreadcrumbNav', breadcrumbNavDirective);
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index da8d8f9a82..e0c12734b2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -8,6 +8,30 @@ function contentPickerController($location, $scope, dialogService, entityResourc
         return str.replace(rgxtrim, '');
     }
 
+    // Populates the name path of the entity (inclusive of the entity).
+    // Example: "Home > Blog > Post 1".
+    function populateNamePath(nodeId, entityType, renderModel) {
+
+        // Only works for content/media (i.e., not for members).
+        var lowerEntityType = entityType.toLowerCase();
+        if (lowerEntityType != "document" && lowerEntityType != "media") {
+            return;
+        }
+
+        // Fetch ancestors and set path.
+        entityResource
+            .getAncestors(nodeId, lowerEntityType)
+            .then(function (anc) {
+                if (anc && anc.length >= 1) {
+                    var names = _.map(anc, function (item) {
+                        return item.name;
+                    });
+                    renderModel.namePath = names.join(" > ");
+                }
+            });
+
+    }
+
     function startWatch() {
         //We need to watch our renderModel so that we can update the underlying $scope.model.value properly, this is required
         // because the ui-sortable doesn't dispatch an event after the digest of the sort operation. Any of the events for UI sortable
@@ -66,11 +90,13 @@ function contentPickerController($location, $scope, dialogService, entityResourc
     $scope.model.config.multiPicker = ($scope.model.config.multiPicker === "1" ? true : false);
     $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "1" ? true : false);
 
-    var entityType = $scope.model.config.startNode.type === "member"
+    var nodeType = $scope.model.config.startNode.type.toLowerCase();
+    var entityType = nodeType === "member"
         ? "Member"
         : $scope.model.config.startNode.type === "media"
         ? "Media"
         : "Document";
+    $scope.showOpenButton = nodeType === "content" || nodeType === "media";
 
     //the dialog options for the picker
     var dialogOptions = {
@@ -146,13 +172,14 @@ function contentPickerController($location, $scope, dialogService, entityResourc
     $scope.showNode = function (index) {
         var item = $scope.renderModel[index];
         var id = item.id;
-        contentResource
-            .getById(id)
-            .then(function (data) {
-                navigationService.syncTree({ tree: "content", path: data.path, forceReload: false, activate: true });
-                var routePath = "content/content/edit/" + id.toString();
-                $location.path(routePath).search("");
+        entityResource.getPath(id, entityType).then(function (path) {
+            navigationService.changeSection(nodeType);
+            navigationService.showTree(nodeType, {
+                tree: nodeType, path: path, forceReload: false, activate: true
             });
+            var routePath = nodeType + "/" + nodeType + "/edit/" + id.toString();
+            $location.path(routePath).search("");
+        });
     }
         
     $scope.add = function (item) {
@@ -162,7 +189,9 @@ function contentPickerController($location, $scope, dialogService, entityResourc
 
         if (currIds.indexOf(item.id) < 0) {
             item.icon = iconHelper.convertFromLegacyIcon(item.icon);
-            $scope.renderModel.push({ name: item.name, id: item.id, icon: item.icon });
+            var renderModel = { name: item.name, id: item.id, icon: item.icon };
+            $scope.renderModel.push(renderModel);
+            populateNamePath(item.id, entityType, renderModel);
         }
     };
 
@@ -194,7 +223,9 @@ function contentPickerController($location, $scope, dialogService, entityResourc
            
             if (entity) {
                 entity.icon = iconHelper.convertFromLegacyIcon(entity.icon);
-                $scope.renderModel.push({ name: entity.name, id: entity.id, icon: entity.icon });
+                var renderModel = { name: entity.name, id: entity.id, icon: entity.icon };
+                $scope.renderModel.push(renderModel);
+                populateNamePath(id, entityType, renderModel);
             }
             
            
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 795afddb7d..aa5ba5a096 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -16,8 +16,8 @@
                     {{node.name}}
                 </a>
                 
-                <div ng-if="!dialogEditor">
-                    <small><a href ng-click="showNode($index)"><localize key="open">Open</localize></a></small>
+                <div ng-if="!dialogEditor && (showOpenButton || model.config.showEditButton)">
+                    <small ng-if="showOpenButton"><a href ng-click="showNode($index)" title="{{node.namePath}}"><localize key="open">Open</localize></a></small>
                     <small ng-if="model.config.showEditButton"><a href umb-launch-mini-editor="node"><localize key="edit">Edit</localize></a></small>
                 </div>
             </li>

From 0409cbe6134ba2382b9a0c9848fcbcb625c62f3c Mon Sep 17 00:00:00 2001
From: Wincent <david.wincent@gmail.com>
Date: Mon, 9 Nov 2015 21:41:25 +0100
Subject: [PATCH 18/68] Changed ImageController.GetBigThumbnail to redirect
 Changed thumbnail paths to include rnd equal to UpdateDate

---
 .../common/services/mediahelper.service.js    | 10 +-
 .../fileupload/fileupload.controller.js       | 51 +++++-----
 src/Umbraco.Web/Editors/ImagesController.cs   | 99 +++++--------------
 3 files changed, 56 insertions(+), 104 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
index c245b99963..68ca32efbc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
@@ -303,8 +303,14 @@ function mediaHelper(umbRequestHelper) {
                 return null;
             }
 
-            //get default big thumbnail from image processor
-            var thumbnailUrl = imagePath + "?width=500";
+            //get the proxy url for big thumbnails (this ensures one is always generated)
+            var thumbnailUrl = umbRequestHelper.getApiUrl(
+                "imagesApiBaseUrl",
+                "GetBigThumbnail",
+                [{ originalImagePath: imagePath }]);
+
+            //var ext = imagePath.substr(imagePath.lastIndexOf('.'));
+            //return imagePath.substr(0, imagePath.lastIndexOf('.')) + "_big-thumb" + ".jpg";
 
             return thumbnailUrl;
         },
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index 6571acd866..d62d76c982 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -63,8 +63,10 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag
 
         _.each($scope.persistedFiles, function (file) {
 
-            //get default big thumbnail from image processor
-            var thumbnailUrl = file.file + "?width=500";
+            var thumbnailUrl = umbRequestHelper.getApiUrl(
+                        "imagesApiBaseUrl",
+                        "GetBigThumbnail",
+                        [{ originalImagePath: file.file }]);
 
             file.thumbnail = thumbnailUrl;
         });
@@ -142,29 +144,28 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag
 };
 angular.module("umbraco")
     .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
-    .run(function(mediaHelper, umbRequestHelper){
+    .run(function(mediaHelper, umbRequestHelper, assetsService){
         if (mediaHelper && mediaHelper.registerFileResolver) {
-
-            //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
-            // they contain different data structures so if we need to query against it we need to be aware of this.
-            mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
-                if (thumbnail) {
-
-                    if (mediaHelper.detectIfImageByExtension(property.value)) {
-
-                        //get default big thumbnail from image processor
-                        var thumbnailUrl = property.value + "?width=500";
-                            
-                        return thumbnailUrl;
-                    }
-                    else {
-                        return null;
-                    }
-                    
+            assetsService.load(["lib/moment/moment-with-locales.js"]).then(
+                function () {
+                    //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
+                    // they contain different data structures so if we need to query against it we need to be aware of this.
+                    mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
+                        if (thumbnail) {
+                            if (mediaHelper.detectIfImageByExtension(property.value)) {
+                                //get default big thumbnail from image processor
+                                var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500";
+                                return thumbnailUrl;
+                            }
+                            else {
+                                return null;
+                            }
+                        }
+                        else {
+                            return property.value;
+                        }
+                    });
                 }
-                else {
-                    return property.value;
-                }
-            });
+            );
         }
-    });
\ No newline at end of file
+    });
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index 54938be76d..14444f53ee 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -8,6 +8,7 @@ using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Media;
+using Umbraco.Core.Models;
 using Umbraco.Web.Mvc;
 using Umbraco.Web.WebApi;
 using Umbraco.Web.WebApi.Filters;
@@ -36,15 +37,8 @@ namespace Umbraco.Web.Editors
             {
                 return Request.CreateResponse(HttpStatusCode.NotFound);
             }
-            var imageProp = media.Properties[Constants.Conventions.Media.File];
-            if (imageProp == null)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
 
-            var imagePath = imageProp.Value.ToString();
-
-            return GetBigThumbnail(imagePath);
+            return GetResized(media, 500);
         }
 
         /// <summary>
@@ -60,7 +54,7 @@ namespace Umbraco.Web.Editors
             if (string.IsNullOrWhiteSpace(originalImagePath))
                 return Request.CreateResponse(HttpStatusCode.OK);
 
-            return GetResized(originalImagePath, 500, "big-thumb");
+            return GetResized(originalImagePath, 500);
         }
 
         /// <summary>
@@ -79,15 +73,8 @@ namespace Umbraco.Web.Editors
             {
                 return new HttpResponseMessage(HttpStatusCode.NotFound);
             }
-            var imageProp = media.Properties[Constants.Conventions.Media.File];
-            if (imageProp == null)
-            {
-                return new HttpResponseMessage(HttpStatusCode.NotFound);
-            }
 
-            var imagePath = imageProp.Value.ToString();
-
-            return GetResized(imagePath, width);
+            return GetResized( media, 500 );
         }
 
         /// <summary>
@@ -101,75 +88,33 @@ namespace Umbraco.Web.Editors
         /// </remarks>
         public HttpResponseMessage GetResized(string imagePath, int width)
         {
-            return GetResized(imagePath, width, Convert.ToString(width));
+            var media = Services.MediaService.GetMediaByPath( imagePath );
+            if (media == null)
+            {
+                return new HttpResponseMessage( HttpStatusCode.NotFound );
+            }
+
+            return GetResized( media, 500 );
         }
 
-        //TODO: We should delegate this to ImageProcessing
-
         /// <summary>
-        /// Gets a resized image - if the requested max width is greater than the original image, only the original image will be returned.
+        /// Gets a resized image by redirecting to ImageProcessor
         /// </summary>
-        /// <param name="imagePath"></param>
+        /// <param name="media"></param>
         /// <param name="width"></param>
-        /// <param name="suffix"></param>
         /// <returns></returns>
-        private HttpResponseMessage GetResized(string imagePath, int width, string suffix)
-        {
-            var mediaFileSystem = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
-            var ext = Path.GetExtension(imagePath);
-
-            //we need to check if it is an image by extension
-            if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.InvariantContains(ext.TrimStart('.')) == false)
+        private HttpResponseMessage GetResized(IMedia media, int width)
+        {
+            var imageProp = media.Properties[Constants.Conventions.Media.File];
+            if (imageProp == null)
             {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
+                return Request.CreateResponse( HttpStatusCode.NotFound );
             }
 
-            var thumbFilePath = imagePath.TrimEnd(ext) + "_" + suffix + ".jpg";
-            var fullOrgPath = mediaFileSystem.GetFullPath(mediaFileSystem.GetRelativePath(imagePath));
-            var fullNewPath = mediaFileSystem.GetFullPath(mediaFileSystem.GetRelativePath(thumbFilePath));
-            var thumbIsNew = mediaFileSystem.FileExists(fullNewPath) == false;
-            if (thumbIsNew)
-            {
-                //we need to generate it
-                if (mediaFileSystem.FileExists(fullOrgPath) == false)
-                {
-                    return Request.CreateResponse(HttpStatusCode.NotFound);
-                }
-
-                using (var fileStream = mediaFileSystem.OpenFile(fullOrgPath))
-                {
-                    if (fileStream.CanSeek) fileStream.Seek(0, 0);
-                    using (var originalImage = Image.FromStream(fileStream))
-                    {
-                        //If it is bigger, then do the resize
-                        if (originalImage.Width >= width && originalImage.Height >= width)
-                        {
-                            ImageHelper.GenerateThumbnail(
-                                originalImage,
-                                width,
-                                fullNewPath,
-                                "jpg",
-                                mediaFileSystem);
-                        }
-                        else
-                        {
-                            //just return the original image
-                            fullNewPath = fullOrgPath;
-                        }
-                        
-                    }
-                }
-            }
-
-            var result = Request.CreateResponse(HttpStatusCode.OK);
-            //NOTE: That we are not closing this stream as the framework will do that for us, if we try it will
-            // fail. See http://stackoverflow.com/questions/9541351/returning-binary-file-from-controller-in-asp-net-web-api
-            var stream = mediaFileSystem.OpenFile(fullNewPath);
-            if (stream.CanSeek) stream.Seek(0, 0);
-            result.Content = new StreamContent(stream);
-            result.Headers.Date = mediaFileSystem.GetLastModified(imagePath);
-            result.Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-            return result;
+            var imagePath = imageProp.Value.ToString();
+            var response = Request.CreateResponse( HttpStatusCode.Found );
+            response.Headers.Location = new Uri( string.Format( "{0}?rnd={1}&width={2}", imagePath, string.Format( "{0:yyyyMMddHHmmss}", media.UpdateDate ), width ), UriKind.Relative );
+            return response;
         }
     }
 }
\ No newline at end of file

From eaf64d18144a7373ad54cfedfe6cb62a2ba90e9d Mon Sep 17 00:00:00 2001
From: Acentrage <polsson.imano@gmail.com>
Date: Thu, 12 Nov 2015 15:33:49 +0100
Subject: [PATCH 19/68] Increased timeout from 200 to 1000 ms so you can
 actually type something and added support for manually submit with enter
 without waiting for the timer.

---
 .../listview/listview.controller.js            | 18 +++++++++++++++---
 .../propertyeditors/listview/listview.html     |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 0569c9faca..de4c26a546 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -243,11 +243,23 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
                 $scope.reloadView($scope.contentId);
             }
         });
-    }, 200));
+    }, 1000));
 
-    $scope.enterSearch = function($event) {
+    $scope.filterResults = function (ev) {
+        //13: enter
+
+        switch (ev.keyCode) {
+            case 13:
+                $scope.options.pageNumber = 1;
+                $scope.actionInProgress = true;
+                $scope.reloadView($scope.contentId);
+                break;
+        }
+    };
+
+    $scope.enterSearch = function ($event) {
         $($event.target).next().focus();
-    }
+    };
 
     $scope.selectAll = function($event) {
         var checkbox = $event.target;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 211524caf0..6d3f75885b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -47,7 +47,7 @@
             <form class="form-search pull-right" novalidate ng-show="!actionInProgress">
                 <div class="inner-addon left-addon">
                     <i class="icon icon-search" ng-click="enterSearch($event)"></i>
-                    <input type="text" class="form-control" localize="placeholder" placeholder="@general_typeToSearch" ng-model="options.filter" prevent-enter-submit no-dirty-check>
+                    <input type="text" class="form-control" localize="placeholder" placeholder="@general_typeToSearch" ng-model="options.filter" ng-keydown="filterResults($event)" prevent-enter-submit no-dirty-check>
                 </div>
             </form>
         </div>

From 6e5329187745524f80749b758ddf5c9ac22ae953 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Tue, 17 Nov 2015 13:42:00 +0100
Subject: [PATCH 20/68] Fixed up a few things.

---
 .../dialogs/template/snippet.controller.js    |  9 ++--
 .../common/dialogs/template/snippet.html      | 50 ++++++++-----------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js
index dc0f2bead1..17e593ff86 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.controller.js
@@ -1,7 +1,8 @@
 angular.module("umbraco").controller('Umbraco.Dialogs.Template.SnippetController',
-		function($scope, $http, dialogService) {
+		function($scope) {
 		    $scope.type = $scope.dialogOptions.type;
-		    $scope.section = {};
-		    $scope.section.name = "";
-		    $scope.section.required = false;          
+		    $scope.section = {
+                name: "",
+                required: false
+		    };
 		});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
index 1414a7471c..61e740f109 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
@@ -1,39 +1,33 @@
 <form novalidate name="contentForm"
-    ng-controller="Umbraco.Dialogs.Template.SnippetController"
-    ng-submit="close()"
-    val-form-manager>
-	
-	<style>
+      ng-controller="Umbraco.Dialogs.Template.SnippetController"
+      ng-submit="close()"
+      val-form-manager>
+    <div class="umb-panel">
 
-	</style>
+        <div class="umb-panel-header">
+            <h1 class="headline" style="margin: 10px 0 0 0">Configure the section</h1>
+        </div>
 
-	<div class="umb-panel">
-
-		<div class="umb-panel-header">
-		    <h1 class="headline" style="margin: 10px 0 0 0">Configure the section</h1>
-		</div>
-
-	    <div class="umb-panel-body with-footer umb-querybuilder">
+        <div class="umb-panel-body with-footer umb-querybuilder">
             <label>
                 Section name:
-                <input type="text" ng-model="section.name" />
+                <input type="text" ng-model="section.name"/>
             </label>
             <label ng-show="type === 'rendersection'">
-                Required?
-                <input type="checkbox" ng-checked="section.required" ng-model="section.required" />
+                <localize key="general_required">Required</localize>?
+                <input type="checkbox" ng-checked="section.required" ng-model="section.required"/>
             </label>
-	    </div>	
+        </div>
 
-		<div class="umb-panel-footer" >
-			<div class="umb-el-wrap umb-panel-buttons">
-		        <div class="btn-toolbar umb-btn-toolbar pull-right">
-		            <a href ng-click="close()" class="btn btn-link">
-		                <localize key="general_close">Close</localize>
-		            </a>
-                    
+        <div class="umb-panel-footer">
+            <div class="umb-el-wrap umb-panel-buttons">
+                <div class="btn-toolbar umb-btn-toolbar pull-right">
+                    <a href ng-click="close()" class="btn btn-link">
+                        <localize key="general_close">Close</localize>
+                    </a>
                     <a href ng-click="submit(section)" class="btn btn-primary">Insert</a>
-		        </div>
-	      </div>
-		</div>
-	</div>
+                </div>
+            </div>
+        </div>
+    </div>
 </form>
\ No newline at end of file

From 9fd80d791a31d1a834b280f2101ff7b336fd4997 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 17 Nov 2015 17:05:00 +0100
Subject: [PATCH 21/68] Creates an IAsyncRenderMvcController which can be used
 instead of IRenderMvcController if developers want access to an async Index
 action.

---
 .../Mvc/DefaultRenderMvcControllerResolver.cs |  6 +++--
 .../Mvc/IAsyncRenderMvcController.cs          | 24 +++++++++++++++++++
 src/Umbraco.Web/Mvc/IRenderMvcController.cs   |  1 +
 src/Umbraco.Web/Mvc/RenderActionInvoker.cs    |  5 ++--
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |  7 +++---
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 6 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 src/Umbraco.Web/Mvc/IAsyncRenderMvcController.cs

diff --git a/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs b/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
index 715fc674a7..dffd80c19a 100644
--- a/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
+++ b/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
@@ -36,6 +36,7 @@ namespace Umbraco.Web.Mvc
         /// <summary>
         /// Returns an instance of the default controller instance.
         /// </summary>
+        [Obsolete("This method will be removed in future versions and should not be used to resolve a controller instance, the IControllerFactory is used for that purpose")]
         public IRenderMvcController GetControllerInstance()
         {
             //try the dependency resolver, then the activator
@@ -64,9 +65,10 @@ namespace Umbraco.Web.Mvc
         /// <param name="type"></param>
         private void ValidateType(Type type)
         {
-            if (TypeHelper.IsTypeAssignableFrom<IRenderMvcController>(type) == false)
+            if (TypeHelper.IsTypeAssignableFrom<IRenderMvcController>(type) == false
+                && TypeHelper.IsTypeAssignableFrom<IAsyncRenderMvcController>(type) == false)
             {
-                throw new InvalidOperationException("The Type specified (" + type + ") is not of type " + typeof(IRenderMvcController));
+                throw new InvalidOperationException("The Type specified (" + type + ") is not of type " + typeof(IRenderMvcController) + " or of type " + typeof(IAsyncRenderMvcController));
             }
         }
 
diff --git a/src/Umbraco.Web/Mvc/IAsyncRenderMvcController.cs b/src/Umbraco.Web/Mvc/IAsyncRenderMvcController.cs
new file mode 100644
index 0000000000..95983a625f
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/IAsyncRenderMvcController.cs
@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using System.Web.Mvc;
+using Umbraco.Web.Models;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// The interface that can be implemented for an async controller to be designated to execute for route hijacking
+    /// </summary>
+    public interface IAsyncRenderMvcController : IController
+    {
+        /// <summary>
+        /// The default action to render the front-end view
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Ideally we could have made a marker interface as a base interface for both the IRenderMvcController and IAsyncRenderMvcController
+        /// however that would require breaking changes in other classes like DefaultRenderMvcControllerResolver since the result would have 
+        /// to be changed. Instead we are hiding the underlying interface method.
+        /// </remarks>
+        Task<ActionResult> Index(RenderModel model);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/IRenderMvcController.cs b/src/Umbraco.Web/Mvc/IRenderMvcController.cs
index 755ccd5854..88890bf410 100644
--- a/src/Umbraco.Web/Mvc/IRenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/IRenderMvcController.cs
@@ -1,5 +1,6 @@
 using System.Web.Http.Filters;
 using System.Web.Mvc;
+using System.Web.Routing;
 using System.Windows.Forms;
 using Umbraco.Web.Models;
 
diff --git a/src/Umbraco.Web/Mvc/RenderActionInvoker.cs b/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
index 1ab341dea7..de08210df6 100644
--- a/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
+++ b/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
@@ -26,8 +26,9 @@ namespace Umbraco.Web.Mvc
 			//now we need to check if it exists, if not we need to return the Index by default
 			if (ad == null)
 			{
-                //check if the controller is an instance of IRenderMvcController
-				if (controllerContext.Controller is IRenderMvcController)
+                //check if the controller is an instance of IRenderMvcController or IAsyncRenderMvcController and find the index
+                if (controllerContext.Controller is IRenderMvcController 
+                    || controllerContext.Controller is IAsyncRenderMvcController)
 				{
 					return controllerDescriptor.FindAction(controllerContext, "Index");
                 }
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 64dcb2a04b..5d230d7177 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -310,8 +310,8 @@ namespace Umbraco.Web.Mvc
             //check if that controller exists
             if (controllerType != null)
             {
-                //ensure the controller is of type 'IRenderMvcController' and ControllerBase
-                if (TypeHelper.IsTypeAssignableFrom<IRenderMvcController>(controllerType)
+                //ensure the controller is of type IRenderMvcController/IAsyncRenderMvcController and ControllerBase
+                if ((TypeHelper.IsTypeAssignableFrom<IRenderMvcController>(controllerType) || TypeHelper.IsTypeAssignableFrom<IAsyncRenderMvcController>(controllerType))
                     && TypeHelper.IsTypeAssignableFrom<ControllerBase>(controllerType))
                 {
                     //set the controller and name to the custom one
@@ -325,10 +325,11 @@ namespace Umbraco.Web.Mvc
                 else
                 {
                     LogHelper.Warn<RenderRouteHandler>(
-                        "The current Document Type {0} matches a locally declared controller of type {1}. Custom Controllers for Umbraco routing must implement '{2}' and inherit from '{3}'.",
+                        "The current Document Type {0} matches a locally declared controller of type {1}. Custom Controllers for Umbraco routing must implement either '{2}' or '{3}' and inherit from '{4}'.",
                         () => publishedContentRequest.PublishedContent.DocumentTypeAlias,
                         () => controllerType.FullName,
                         () => typeof(IRenderMvcController).FullName,
+                        () => typeof(IAsyncRenderMvcController).FullName,
                         () => typeof(ControllerBase).FullName);
 
                     //we cannot route to this custom controller since it is not of the correct type so we'll continue with the defaults
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7a4c6a4cd0..ee2f8906e3 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -304,6 +304,7 @@
     <Compile Include="Media\EmbedProviders\Flickr.cs" />
     <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
     <Compile Include="Models\PublishedContentWithKeyBase.cs" />
+    <Compile Include="Mvc\IAsyncRenderMvcController.cs" />
     <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
     <Compile Include="RequestLifespanMessagesFactory.cs" />
     <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />

From 916bad82dfcad70957cdfd46c7fb90bfafaf5fde Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 18 Nov 2015 14:59:29 +0100
Subject: [PATCH 22/68] Ensures that the RenderActionInvoker isn't doing
 anything special so that MVC takes care of everything regarding async vs
 non-async and any controller descriptor/action descriptor lookups and cache.
 Creates a RenderIndexActionSelectorAttribute - this is used to decorate the
 underlying RenderMvcController.Index action. MVC will call into this method
 to check if the MethodInfo is valid, we then do a quick comparison of types,
 if the current type is the same as the reflected type, this means that the
 Index action has been overridden or there is no custom controller... lets use
 it.  If the types don't match we'll do a simple reflected lookup to check if
 the reflected controller type (current controller) has more than one index
 action, if so, it means that a custom controller is in play and it has a
 custom index action... so we won't use the base class action and then it's up
  to MVC to find any other matching Index action based on the current request
 parameters. Added some tests for this too.

---
 ...RenderIndexActionSelectorAttributeTests.cs | 173 ++++++++++++++++++
 .../Mvc/ViewDataDictionaryExtensionTests.cs   |   4 +-
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   1 +
 .../Mvc/DefaultRenderMvcControllerResolver.cs |   7 +-
 .../Mvc/IAsyncRenderMvcController.cs          |  24 ---
 src/Umbraco.Web/Mvc/IRenderController.cs      |  12 ++
 src/Umbraco.Web/Mvc/IRenderMvcController.cs   |   3 +-
 src/Umbraco.Web/Mvc/RenderActionInvoker.cs    |  10 +-
 .../Mvc/RenderIndexActionSelectorAttribute.cs |  42 +++++
 src/Umbraco.Web/Mvc/RenderMvcController.cs    |  13 +-
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs     |   9 +-
 src/Umbraco.Web/Umbraco.Web.csproj            |   3 +-
 12 files changed, 251 insertions(+), 50 deletions(-)
 create mode 100644 src/Umbraco.Tests/Mvc/RenderIndexActionSelectorAttributeTests.cs
 delete mode 100644 src/Umbraco.Web/Mvc/IAsyncRenderMvcController.cs
 create mode 100644 src/Umbraco.Web/Mvc/IRenderController.cs
 create mode 100644 src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs

diff --git a/src/Umbraco.Tests/Mvc/RenderIndexActionSelectorAttributeTests.cs b/src/Umbraco.Tests/Mvc/RenderIndexActionSelectorAttributeTests.cs
new file mode 100644
index 0000000000..3f327d3155
--- /dev/null
+++ b/src/Umbraco.Tests/Mvc/RenderIndexActionSelectorAttributeTests.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Profiling;
+using Umbraco.Web;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.Routing;
+using Umbraco.Web.Security;
+
+namespace Umbraco.Tests.Mvc
+{
+    [TestFixture]
+    public class RenderIndexActionSelectorAttributeTests
+    {
+        private MethodInfo GetRenderMvcControllerIndexMethodFromCurrentType(Type currType)
+        {
+            return currType.GetMethods().Single(x =>
+            {
+                if (x.Name != "Index") return false;
+                if (x.ReturnParameter == null || x.ReturnParameter.ParameterType != typeof (ActionResult)) return false;
+                var p = x.GetParameters();
+                if (p.Length != 1) return false;
+                if (p[0].ParameterType != typeof (RenderModel)) return false;
+                return true;
+            });
+        }
+
+        [Test]
+        public void Matches_Default_Index()
+        {
+            var attr = new RenderIndexActionSelectorAttribute();
+            var req = new RequestContext();
+            var appCtx = new ApplicationContext(
+                CacheHelper.CreateDisabledCacheHelper(),
+                new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var umbCtx = UmbracoContext.EnsureContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new Mock<WebSecurity>(null, null).Object,
+                Mock.Of<IUmbracoSettingsSection>(),
+                Enumerable.Empty<IUrlProvider>(),
+                true);
+            var ctrl = new MatchesDefaultIndexController(umbCtx);
+            var controllerCtx = new ControllerContext(req, ctrl);
+            var result = attr.IsValidForRequest(controllerCtx,
+                GetRenderMvcControllerIndexMethodFromCurrentType(ctrl.GetType()));
+
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void Matches_Overriden_Index()
+        {
+            var attr = new RenderIndexActionSelectorAttribute();
+            var req = new RequestContext();
+            var appCtx = new ApplicationContext(
+                CacheHelper.CreateDisabledCacheHelper(),
+                new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var umbCtx = UmbracoContext.EnsureContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new Mock<WebSecurity>(null, null).Object,
+                Mock.Of<IUmbracoSettingsSection>(),
+                Enumerable.Empty<IUrlProvider>(),
+                true);
+            var ctrl = new MatchesOverriddenIndexController(umbCtx);
+            var controllerCtx = new ControllerContext(req, ctrl);
+            var result = attr.IsValidForRequest(controllerCtx,
+                GetRenderMvcControllerIndexMethodFromCurrentType(ctrl.GetType()));
+
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void Matches_Custom_Index()
+        {
+            var attr = new RenderIndexActionSelectorAttribute();
+            var req = new RequestContext();
+            var appCtx = new ApplicationContext(
+                CacheHelper.CreateDisabledCacheHelper(),
+                new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var umbCtx = UmbracoContext.EnsureContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new Mock<WebSecurity>(null, null).Object,
+                Mock.Of<IUmbracoSettingsSection>(),
+                Enumerable.Empty<IUrlProvider>(),
+                true);
+            var ctrl = new MatchesCustomIndexController(umbCtx);
+            var controllerCtx = new ControllerContext(req, ctrl);
+            var result = attr.IsValidForRequest(controllerCtx,
+                GetRenderMvcControllerIndexMethodFromCurrentType(ctrl.GetType()));
+
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void Matches_Async_Index_Same_Signature()
+        {
+            var attr = new RenderIndexActionSelectorAttribute();
+            var req = new RequestContext();
+            var appCtx = new ApplicationContext(
+                CacheHelper.CreateDisabledCacheHelper(),
+                new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var umbCtx = UmbracoContext.EnsureContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new Mock<WebSecurity>(null, null).Object,
+                Mock.Of<IUmbracoSettingsSection>(),
+                Enumerable.Empty<IUrlProvider>(),
+                true);
+            var ctrl = new MatchesAsyncIndexController(umbCtx);
+            var controllerCtx = new ControllerContext(req, ctrl);
+            var result = attr.IsValidForRequest(controllerCtx,
+                GetRenderMvcControllerIndexMethodFromCurrentType(ctrl.GetType()));
+
+            Assert.IsFalse(result);
+        }
+
+        public class MatchesDefaultIndexController : RenderMvcController
+        {
+            public MatchesDefaultIndexController(UmbracoContext umbracoContext) : base(umbracoContext)
+            {
+            }
+        }
+
+        public class MatchesOverriddenIndexController : RenderMvcController
+        {
+            public MatchesOverriddenIndexController(UmbracoContext umbracoContext) : base(umbracoContext)
+            {
+            }
+            
+            public override ActionResult Index(RenderModel model)
+            {
+                return base.Index(model);
+            }
+        }
+
+        public class MatchesCustomIndexController : RenderMvcController
+        {
+            public MatchesCustomIndexController(UmbracoContext umbracoContext) : base(umbracoContext)
+            {
+            }
+
+            public ActionResult Index(RenderModel model, int page)
+            {
+                return base.Index(model);
+            }
+        }
+
+        public class MatchesAsyncIndexController : RenderMvcController
+        {
+            public MatchesAsyncIndexController(UmbracoContext umbracoContext) : base(umbracoContext)
+            {
+            }
+
+            public new async Task<ActionResult> Index(RenderModel model)
+            {
+                return await Task.FromResult(base.Index(model));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Tests/Mvc/ViewDataDictionaryExtensionTests.cs b/src/Umbraco.Tests/Mvc/ViewDataDictionaryExtensionTests.cs
index c13818a03c..4c06d30796 100644
--- a/src/Umbraco.Tests/Mvc/ViewDataDictionaryExtensionTests.cs
+++ b/src/Umbraco.Tests/Mvc/ViewDataDictionaryExtensionTests.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Text;
 using System.Web.Mvc;
 using NUnit.Framework;
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 0e7dc711b8..59a9166e5a 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -180,6 +180,7 @@
     <Compile Include="Logging\AsyncRollingFileAppenderTest.cs" />
     <Compile Include="Logging\DebugAppender.cs" />
     <Compile Include="Logging\ParallelForwarderTest.cs" />
+    <Compile Include="Mvc\RenderIndexActionSelectorAttributeTests.cs" />
     <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\PartialViewRepositoryTests.cs" />
diff --git a/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs b/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
index dffd80c19a..641491c5ba 100644
--- a/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
+++ b/src/Umbraco.Web/Mvc/DefaultRenderMvcControllerResolver.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Web.Mvc;
@@ -37,6 +38,7 @@ namespace Umbraco.Web.Mvc
         /// Returns an instance of the default controller instance.
         /// </summary>
         [Obsolete("This method will be removed in future versions and should not be used to resolve a controller instance, the IControllerFactory is used for that purpose")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public IRenderMvcController GetControllerInstance()
         {
             //try the dependency resolver, then the activator
@@ -65,10 +67,9 @@ namespace Umbraco.Web.Mvc
         /// <param name="type"></param>
         private void ValidateType(Type type)
         {
-            if (TypeHelper.IsTypeAssignableFrom<IRenderMvcController>(type) == false
-                && TypeHelper.IsTypeAssignableFrom<IAsyncRenderMvcController>(type) == false)
+            if (TypeHelper.IsTypeAssignableFrom<IRenderController>(type) == false)
             {
-                throw new InvalidOperationException("The Type specified (" + type + ") is not of type " + typeof(IRenderMvcController) + " or of type " + typeof(IAsyncRenderMvcController));
+                throw new InvalidOperationException("The Type specified (" + type + ") is not of type " + typeof (IRenderController));
             }
         }
 
diff --git a/src/Umbraco.Web/Mvc/IAsyncRenderMvcController.cs b/src/Umbraco.Web/Mvc/IAsyncRenderMvcController.cs
deleted file mode 100644
index 95983a625f..0000000000
--- a/src/Umbraco.Web/Mvc/IAsyncRenderMvcController.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using System.Web.Mvc;
-using Umbraco.Web.Models;
-
-namespace Umbraco.Web.Mvc
-{
-    /// <summary>
-    /// The interface that can be implemented for an async controller to be designated to execute for route hijacking
-    /// </summary>
-    public interface IAsyncRenderMvcController : IController
-    {
-        /// <summary>
-        /// The default action to render the front-end view
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Ideally we could have made a marker interface as a base interface for both the IRenderMvcController and IAsyncRenderMvcController
-        /// however that would require breaking changes in other classes like DefaultRenderMvcControllerResolver since the result would have 
-        /// to be changed. Instead we are hiding the underlying interface method.
-        /// </remarks>
-        Task<ActionResult> Index(RenderModel model);
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/IRenderController.cs b/src/Umbraco.Web/Mvc/IRenderController.cs
new file mode 100644
index 0000000000..e4303e06e5
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/IRenderController.cs
@@ -0,0 +1,12 @@
+using System.Web.Mvc;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// A marker interface to designate that a controller will be used for Umbraco front-end requests and/or route hijacking
+    /// </summary>
+    public interface IRenderController : IController
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/IRenderMvcController.cs b/src/Umbraco.Web/Mvc/IRenderMvcController.cs
index 88890bf410..53865cd4ee 100644
--- a/src/Umbraco.Web/Mvc/IRenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/IRenderMvcController.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Web.Http.Filters;
 using System.Web.Mvc;
 using System.Web.Routing;
@@ -9,7 +10,7 @@ namespace Umbraco.Web.Mvc
     /// <summary>
     /// The interface that must be implemented for a controller to be designated to execute for route hijacking
     /// </summary>
-    public interface IRenderMvcController : IController
+    public interface IRenderMvcController : IRenderController
     {
         /// <summary>
         /// The default action to render the front-end view
diff --git a/src/Umbraco.Web/Mvc/RenderActionInvoker.cs b/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
index de08210df6..55be6591ad 100644
--- a/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
+++ b/src/Umbraco.Web/Mvc/RenderActionInvoker.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Mvc;
@@ -12,6 +13,8 @@ namespace Umbraco.Web.Mvc
 	/// </summary>
     public class RenderActionInvoker : AsyncControllerActionInvoker
 	{        
+
+
 		/// <summary>
 		/// Ensures that if an action for the Template name is not explicitly defined by a user, that the 'Index' action will execute
 		/// </summary>
@@ -26,15 +29,14 @@ namespace Umbraco.Web.Mvc
 			//now we need to check if it exists, if not we need to return the Index by default
 			if (ad == null)
 			{
-                //check if the controller is an instance of IRenderMvcController or IAsyncRenderMvcController and find the index
-                if (controllerContext.Controller is IRenderMvcController 
-                    || controllerContext.Controller is IAsyncRenderMvcController)
+                //check if the controller is an instance of IRenderController and find the index
+                if (controllerContext.Controller is IRenderController)
 				{
 					return controllerDescriptor.FindAction(controllerContext, "Index");
                 }
 			}
 			return ad;
 		}
-
+        
 	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs b/src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs
new file mode 100644
index 0000000000..1d1c56db11
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/RenderIndexActionSelectorAttribute.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Reflection;
+using System.Web.Mvc;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// A custom ActionMethodSelector which will ensure that the RenderMvcController.Index(RenderModel model) action will be executed
+    /// if the 
+    /// </summary>
+    internal class RenderIndexActionSelectorAttribute : ActionMethodSelectorAttribute
+    {
+        private static readonly ConcurrentDictionary<Type, ReflectedControllerDescriptor> ControllerDescCache = new ConcurrentDictionary<Type, ReflectedControllerDescriptor>();
+
+        /// <summary>
+        /// Determines whether the action method selection is valid for the specified controller context.
+        /// </summary>
+        /// <returns>
+        /// true if the action method selection is valid for the specified controller context; otherwise, false.
+        /// </returns>
+        /// <param name="controllerContext">The controller context.</param><param name="methodInfo">Information about the action method.</param>
+        public override bool IsValidForRequest(ControllerContext controllerContext, MethodInfo methodInfo)
+        {
+            var currType = methodInfo.ReflectedType;
+            var baseType = methodInfo.DeclaringType;
+
+            //It's the same type, so this must be the Index action to use
+            if (currType == baseType) return true;
+
+            if (currType == null) return false;
+
+            var controllerDesc = ControllerDescCache.GetOrAdd(currType, type => new ReflectedControllerDescriptor(currType));
+            var actions = controllerDesc.GetCanonicalActions();
+
+            //If there are more than one Index action for this controller, then 
+            // this base class one should not be matched
+            return actions.Count(x => x.ActionName == "Index") <= 1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/RenderMvcController.cs b/src/Umbraco.Web/Mvc/RenderMvcController.cs
index 03f93d89e3..dd06b3ced1 100644
--- a/src/Umbraco.Web/Mvc/RenderMvcController.cs
+++ b/src/Umbraco.Web/Mvc/RenderMvcController.cs
@@ -1,22 +1,17 @@
 using System;
-using System.IO;
 using System.Web.Mvc;
-using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Services;
-using Umbraco.Core.Models;
 using Umbraco.Web.Models;
 using Umbraco.Web.Routing;
-using Umbraco.Web.Security;
 
 namespace Umbraco.Web.Mvc
 {
 
     /// <summary>
-    /// A controller to render front-end requests
+    /// The default controller to render front-end requests
     /// </summary>
-    [PreRenderViewActionFilter]
+    [PreRenderViewActionFilter]    
     public class RenderMvcController : UmbracoController, IRenderMvcController
     {
 
@@ -64,7 +59,7 @@ namespace Umbraco.Web.Mvc
             {
                 if (_publishedContentRequest != null)
                     return _publishedContentRequest;
-                if (!RouteData.DataTokens.ContainsKey("umbraco-doc-request"))
+                if (RouteData.DataTokens.ContainsKey("umbraco-doc-request") == false)
                 {
                     throw new InvalidOperationException("DataTokens must contain an 'umbraco-doc-request' key with a PublishedContentRequest object");
                 }
@@ -111,10 +106,10 @@ namespace Umbraco.Web.Mvc
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
+        [RenderIndexActionSelector]
         public virtual ActionResult Index(RenderModel model)
         {
             return CurrentTemplate(model);
         }
-
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 5d230d7177..bce3515c1b 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -310,8 +310,8 @@ namespace Umbraco.Web.Mvc
             //check if that controller exists
             if (controllerType != null)
             {
-                //ensure the controller is of type IRenderMvcController/IAsyncRenderMvcController and ControllerBase
-                if ((TypeHelper.IsTypeAssignableFrom<IRenderMvcController>(controllerType) || TypeHelper.IsTypeAssignableFrom<IAsyncRenderMvcController>(controllerType))
+                //ensure the controller is of type IRenderMvcController and ControllerBase
+                if (TypeHelper.IsTypeAssignableFrom<IRenderController>(controllerType)
                     && TypeHelper.IsTypeAssignableFrom<ControllerBase>(controllerType))
                 {
                     //set the controller and name to the custom one
@@ -325,11 +325,10 @@ namespace Umbraco.Web.Mvc
                 else
                 {
                     LogHelper.Warn<RenderRouteHandler>(
-                        "The current Document Type {0} matches a locally declared controller of type {1}. Custom Controllers for Umbraco routing must implement either '{2}' or '{3}' and inherit from '{4}'.",
+                        "The current Document Type {0} matches a locally declared controller of type {1}. Custom Controllers for Umbraco routing must implement '{2}' and inherit from '{3}'.",
                         () => publishedContentRequest.PublishedContent.DocumentTypeAlias,
                         () => controllerType.FullName,
-                        () => typeof(IRenderMvcController).FullName,
-                        () => typeof(IAsyncRenderMvcController).FullName,
+                        () => typeof(IRenderController).FullName,
                         () => typeof(ControllerBase).FullName);
 
                     //we cannot route to this custom controller since it is not of the correct type so we'll continue with the defaults
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index ee2f8906e3..834964c8ca 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -304,7 +304,8 @@
     <Compile Include="Media\EmbedProviders\Flickr.cs" />
     <Compile Include="Models\ContentEditing\SimpleNotificationModel.cs" />
     <Compile Include="Models\PublishedContentWithKeyBase.cs" />
-    <Compile Include="Mvc\IAsyncRenderMvcController.cs" />
+    <Compile Include="Mvc\IRenderController.cs" />
+    <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
     <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
     <Compile Include="RequestLifespanMessagesFactory.cs" />
     <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />

From 9c027dcdbc97a703bee067e33f70eecb29672016 Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Thu, 19 Nov 2015 10:32:17 +0100
Subject: [PATCH 23/68] some ui love for the panel dialogs

---
 src/Umbraco.Web.UI.Client/src/less/main.less  | 41 +++++++++++++++----
 .../common/dialogs/template/snippet.html      | 14 ++++---
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 74010962f3..ad07c6835e 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -133,7 +133,7 @@ h5{
 .umb-control-group label.control-label {
   text-align: left
 }
-.umb-control-group label .help-block, 
+.umb-control-group label .help-block,
 .umb-control-group label small {
   font-size: 11px;
   color: #a0a0a0;
@@ -194,7 +194,7 @@ h5{
 
 .umb-dashboard-control a{text-decoration: underline;}
 
-.umb-dashboard-control 
+.umb-dashboard-control
   iframe{ position: absolute; display: block; width: 99%; height: 99%; overflow: auto !important;}
 
 
@@ -239,16 +239,16 @@ table thead a {
 
 .umb-table tbody.ui-sortable tr.ui-sortable-helper {
   background-color: @sortableHelperBg;
-  border: none; 
+  border: none;
 }
-.umb-table tbody.ui-sortable tr.ui-sortable-helper td 
+.umb-table tbody.ui-sortable tr.ui-sortable-helper td
  {
     border:none;
 }
 
 .umb-table tbody.ui-sortable tr.ui-sortable-placeholder {
   background-color: @sortablePlaceholderBg;
-  border:none;   
+  border:none;
 }
 
 .umb-table tbody.ui-sortable tr.ui-sortable-placeholder td
@@ -368,7 +368,7 @@ table thead a {
   background: @inputBorder;
   height: 1px;
   margin: 20px 0 0 0;
-  width: 82%; 
+  width: 82%;
   float: left;
 }
 
@@ -437,7 +437,7 @@ table thead a {
     color:@green;
 }
 
-// Loading Animation 
+// Loading Animation
 // ------------------------
 
 .umb-loader{
@@ -523,11 +523,34 @@ height:1px;
 }
 
 .umb-loader-wrapper {
-    
+
     position: absolute;
     right: 0;
     left: 0;
     margin: 10px 0;
-    overflow: hidden; 
+    overflow: hidden;
 
 }
+
+
+// Helpers
+
+.strong {
+	font-weight: bold;
+}
+
+.inline {
+	display: inline;
+}
+
+.input-label--title {
+	font-weight: bold;
+	color: @black;
+	margin-bottom: 3px;
+}
+
+.panel-dialog--header {
+	font-weight: bold;
+	border-bottom: 1px solid @gray;
+	padding-bottom: 10px;
+}
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
index 61e740f109..6724a183d6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
@@ -5,17 +5,21 @@
     <div class="umb-panel">
 
         <div class="umb-panel-header">
-            <h1 class="headline" style="margin: 10px 0 0 0">Configure the section</h1>
+            <h4 class="panel-dialog--header" style="border-bottom: 1px solid whitesmoke">Configure the section</h4>
         </div>
 
         <div class="umb-panel-body with-footer umb-querybuilder">
             <label>
-                Section name:
+                <div class="input-label--title">
+                    Section name:
+                </div>
                 <input type="text" ng-model="section.name"/>
             </label>
             <label ng-show="type === 'rendersection'">
-                <localize key="general_required">Required</localize>?
-                <input type="checkbox" ng-checked="section.required" ng-model="section.required"/>
+                <input style="margin: 0;" type="checkbox" ng-checked="section.required" ng-model="section.required"/>
+                <small class="small inline">
+                    <localize key="general_required">Required</localize>
+                </small>
             </label>
         </div>
 
@@ -30,4 +34,4 @@
             </div>
         </div>
     </div>
-</form>
\ No newline at end of file
+</form>

From 6e27caa5478381693e830234b6b95139f36c54ca Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Thu, 19 Nov 2015 11:11:09 +0100
Subject: [PATCH 24/68] Added comments and notes

---
 src/Umbraco.Web.UI.Client/src/less/main.less              | 8 +++++++-
 .../src/views/common/dialogs/template/snippet.html        | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index ad07c6835e..4b6388a01a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -543,14 +543,20 @@ height:1px;
 	display: inline;
 }
 
+//NOTE titles for input fields
 .input-label--title {
 	font-weight: bold;
 	color: @black;
 	margin-bottom: 3px;
 }
 
+//NOTE Use this for headers in the panels
 .panel-dialog--header {
-	font-weight: bold;
 	border-bottom: 1px solid @gray;
+	margin: 10px 0;
 	padding-bottom: 10px;
+
+	font-size: 14px * 1.25; //NOTE @font-size-h4 can't be used here for some reason. In all variables regarding font-sizes is a hassle.
+	font-weight: bold;
+	line-height: 20px;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
index 6724a183d6..ca2b57d618 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
@@ -5,7 +5,7 @@
     <div class="umb-panel">
 
         <div class="umb-panel-header">
-            <h4 class="panel-dialog--header" style="border-bottom: 1px solid whitesmoke">Configure the section</h4>
+            <div class="panel-dialog--header" style="border-bottom: 1px solid whitesmoke">Configure the section</div>
         </div>
 
         <div class="umb-panel-body with-footer umb-querybuilder">

From 2634e33f5104c153d495d3382b460d0775ef51c7 Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Thu, 19 Nov 2015 11:27:56 +0100
Subject: [PATCH 25/68] Used @fontSizeLarge variable to determine font-size for
 panel-dialog--header

---
 src/Umbraco.Web.UI.Client/src/less/main.less | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 4b6388a01a..fb6bcbefeb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -555,8 +555,7 @@ height:1px;
 	border-bottom: 1px solid @gray;
 	margin: 10px 0;
 	padding-bottom: 10px;
-
-	font-size: 14px * 1.25; //NOTE @font-size-h4 can't be used here for some reason. In all variables regarding font-sizes is a hassle.
+	font-size: @fontSizeLarge;
 	font-weight: bold;
 	line-height: 20px;
 }

From 397ef326657c63126ac35ce11a1892e6215e18ac Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Thu, 19 Nov 2015 11:40:29 +0100
Subject: [PATCH 26/68] Added hover & active state to input-label--small

---
 src/Umbraco.Web.UI.Client/src/less/main.less  | 21 +++++++++++++++++--
 .../common/dialogs/template/snippet.html      |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index fb6bcbefeb..2755f74e51 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -543,14 +543,31 @@ height:1px;
 	display: inline;
 }
 
-//NOTE titles for input fields
+
+//TODO Needs to be moved out in other files
+// Titles for input fields
 .input-label--title {
 	font-weight: bold;
 	color: @black;
 	margin-bottom: 3px;
 }
 
-//NOTE Use this for headers in the panels
+// Used for input checkmark fields
+.input-label--small {
+	display: inline;
+	font-size: 12px;
+	color: #b3b3b3;
+
+	&:hover {
+		color: @black;
+	}
+}
+// Checked state of the input-label--small
+input:checked + .input-label--small {
+	color: @blue;
+}
+
+// Use this for headers in the panels
 .panel-dialog--header {
 	border-bottom: 1px solid @gray;
 	margin: 10px 0;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
index ca2b57d618..7b5187303e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html
@@ -17,9 +17,9 @@
             </label>
             <label ng-show="type === 'rendersection'">
                 <input style="margin: 0;" type="checkbox" ng-checked="section.required" ng-model="section.required"/>
-                <small class="small inline">
+                <div class="input-label--small">
                     <localize key="general_required">Required</localize>
-                </small>
+                </div>
             </label>
         </div>
 

From 5bf8b8ecba6c719fdd89254d9a74150e80eb8690 Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Thu, 19 Nov 2015 11:44:33 +0100
Subject: [PATCH 27/68] Used less function 'fade' instead of random color

---
 src/Umbraco.Web.UI.Client/src/less/main.less | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 2755f74e51..c7411ac9a3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -555,8 +555,10 @@ height:1px;
 // Used for input checkmark fields
 .input-label--small {
 	display: inline;
+
 	font-size: 12px;
-	color: #b3b3b3;
+	color: fade(@black, 70);
+	font-weight: bold;
 
 	&:hover {
 		color: @black;

From 775a6f80eae2557d1dcff047cb67b07fa30a4395 Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Thu, 19 Nov 2015 11:47:49 +0100
Subject: [PATCH 28/68] Added comments to support the changes

---
 src/Umbraco.Web.UI.Client/src/less/main.less | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index c7411ac9a3..572afb8f30 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -544,7 +544,10 @@ height:1px;
 }
 
 
-//TODO Needs to be moved out in other files
+// Input label styles
+// @Simon: not sure where to put this part yet
+// --- TODO Needs to be divided into the right .less files
+
 // Titles for input fields
 .input-label--title {
 	font-weight: bold;
@@ -564,6 +567,7 @@ height:1px;
 		color: @black;
 	}
 }
+
 // Checked state of the input-label--small
 input:checked + .input-label--small {
 	color: @blue;

From f472f5d95017d692b36aab5cee789e24400fea8d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 19 Nov 2015 11:57:24 +0100
Subject: [PATCH 29/68] Ensures that OWIN signout method is called - this
 ensures that any auth middleware configured for the current user is called
 for sign out. Updates our cookie middleware provider to also ensure that our
 custom cookies are cleared when signing out with OWIN.

---
 .../BackOfficeCookieAuthenticationProvider.cs | 26 +++++++++++++++++++
 .../UmbracoBackOfficeLogoutAttribute.cs       |  6 +++++
 2 files changed, 32 insertions(+)

diff --git a/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs b/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
index 5247ea0af4..086d1a77bf 100644
--- a/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
+++ b/src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
@@ -1,12 +1,38 @@
+using System;
 using System.Globalization;
+using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Owin;
 using Microsoft.Owin.Security.Cookies;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Core.Security
 {
     public class BackOfficeCookieAuthenticationProvider : CookieAuthenticationProvider
     {
+        public override void ResponseSignOut(CookieResponseSignOutContext context)
+        {
+            base.ResponseSignOut(context);
+
+            //Make sure the definitely all of these cookies are cleared when signing out with cookies
+            context.Response.Cookies.Append(UmbracoConfig.For.UmbracoSettings().Security.AuthCookieName, "", new CookieOptions
+            {
+                Expires = DateTime.Now.AddYears(-1),
+                Path = "/"
+            });
+            context.Response.Cookies.Append(Constants.Web.PreviewCookieName, "", new CookieOptions
+            {
+                Expires = DateTime.Now.AddYears(-1),
+                Path = "/"
+            });
+            context.Response.Cookies.Append(Constants.Security.BackOfficeExternalCookieName, "", new CookieOptions
+            {
+                Expires = DateTime.Now.AddYears(-1),
+                Path = "/"
+            });
+        }
+
         /// <summary>
         /// Ensures that the culture is set correctly for the current back office user
         /// </summary>
diff --git a/src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs b/src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs
index 693d45c792..336d8bb403 100644
--- a/src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs
@@ -17,7 +17,13 @@ namespace Umbraco.Web.WebApi.Filters
         {            
             if (context.Response == null) return;
             if (context.Response.IsSuccessStatusCode == false) return;
+
+            //this clears out all of our cookies
             context.Response.UmbracoLogoutWebApi();
+
+            //this calls the underlying owin sign out logic - which should call the 
+            // auth providers middleware callbacks if using custom auth middleware
+            context.Request.TryGetOwinContext().Result.Authentication.SignOut();
         }
     }
 }
\ No newline at end of file

From 71ec09486d9b1e691a9bf7948beb62d633a5eaee Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 19 Nov 2015 14:17:06 +0100
Subject: [PATCH 30/68] Reverts the 'fix' from U4-7118 since it is incorrect.
 Updates the sliding expiration of the cookie/ticket when the user is supposed
 to be always logged in to 30 minutes in case the timeout is actually set very
 low in config.

---
 .../Security/Identity/GetUserSecondsMiddleWare.cs           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
index f9b9fc0ca6..85cab39120 100644
--- a/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
@@ -76,15 +76,15 @@ namespace Umbraco.Web.Security.Identity
                         {
                             var utcNow = DateTime.Now.ToUniversalTime();
                             ticket.Properties.IssuedUtc = utcNow;
-                            ticket.Properties.ExpiresUtc = utcNow.AddMinutes(_authOptions.LoginTimeoutMinutes);
+                            ticket.Properties.ExpiresUtc = utcNow.AddMinutes(30);
 
                             var cookieValue = _authOptions.TicketDataFormat.Protect(ticket);
 
                             var cookieOptions = new CookieOptions
                             {
                                 Path = "/",
-                                Domain = _authOptions.CookieDomain ?? "FALSE",
-                                Expires = DateTime.Now.AddMinutes(_authOptions.LoginTimeoutMinutes),
+                                Domain = _authOptions.CookieDomain ?? null,
+                                Expires = DateTime.Now.AddMinutes(30),
                                 HttpOnly = true,
                                 Secure = _authOptions.CookieSecure == CookieSecureOption.Always
                                          || (_authOptions.CookieSecure == CookieSecureOption.SameAsRequest && request.Uri.Scheme.InvariantEquals("https")),

From 8053db32b6fc1e781aed4feec6fc0ac449b63a3b Mon Sep 17 00:00:00 2001
From: Simon Busborg <simon@busb.org>
Date: Thu, 19 Nov 2015 15:40:38 +0100
Subject: [PATCH 31/68] code comments

---
 src/Umbraco.Web.UI.Client/src/less/main.less | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/main.less b/src/Umbraco.Web.UI.Client/src/less/main.less
index 572afb8f30..b0e6c8f5c3 100644
--- a/src/Umbraco.Web.UI.Client/src/less/main.less
+++ b/src/Umbraco.Web.UI.Client/src/less/main.less
@@ -546,38 +546,43 @@ height:1px;
 
 // Input label styles
 // @Simon: not sure where to put this part yet
-// --- TODO Needs to be divided into the right .less files
+// --- TODO Needs to be divided into the right .less directories
+
 
 // Titles for input fields
 .input-label--title {
 	font-weight: bold;
 	color: @black;
+
 	margin-bottom: 3px;
 }
 
+
 // Used for input checkmark fields
 .input-label--small {
 	display: inline;
 
 	font-size: 12px;
-	color: fade(@black, 70);
 	font-weight: bold;
+	color: fade(@black, 70);
 
 	&:hover {
 		color: @black;
 	}
 }
 
-// Checked state of the input-label--small
-input:checked + .input-label--small {
+input[type=checkbox]:checked + .input-label--small {
 	color: @blue;
 }
 
+
 // Use this for headers in the panels
 .panel-dialog--header {
 	border-bottom: 1px solid @gray;
+
 	margin: 10px 0;
 	padding-bottom: 10px;
+
 	font-size: @fontSizeLarge;
 	font-weight: bold;
 	line-height: 20px;

From 555b520a0ce85b8bc3282a3b4dd076d135378b1e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 19 Nov 2015 18:12:21 +0100
Subject: [PATCH 32/68] Cleans up the usages of auth cookies. OWIN is in charge
 of auth cookies but because we have Webforms, WebApi, MVC and OWIN, they all
 like to deal with cookies differently. OWIN should still be solely in charge
 of the auth cookies, so the auth extensions are cleaned up, the renewal now
 works by queuing the renewal and we have custom middleware detect if a force
 renewal has been queued and we renew the auth cookie there. Have obsoleted a
 few methods that should not be used that write auth tickets directly (this is
 purely for backwards compat with webforms). All of these changes now ensure
 that the auth cookie is renewed consistently between Webforms, WebApi, MVC
 and OWIN. Some changes also include ensuring that OWIN is used to sign out.

---
 src/Umbraco.Core/Constants-Web.cs             |   7 +-
 .../Security/AuthenticationExtensions.cs      |  81 +++----------
 .../Security/BackOfficeSignInManager.cs       |   5 +
 .../TestHelpers/FakeHttpContextFactory.cs     |   3 +-
 .../Editors/AuthenticationController.cs       |  18 ++-
 src/Umbraco.Web/HttpCookieExtensions.cs       |  11 ++
 .../InstallSteps/SetUmbracoVersionStep.cs     |   8 +-
 .../Security/Identity/AppBuilderExtensions.cs |  20 +++-
 .../Identity/BackOfficeCookieManager.cs       |  44 ++++++-
 ...ForceRenewalCookieAuthenticationHandler.cs | 112 ++++++++++++++++++
 ...ceRenewalCookieAuthenticationMiddleware.cs |  22 ++++
 .../Identity/GetUserSecondsMiddleWare.cs      |   4 +-
 .../UmbracoBackOfficeCookieAuthOptions.cs     |   2 +-
 .../Security/{Identity => }/OwinExtensions.cs |  10 +-
 src/Umbraco.Web/Security/WebAuthExtensions.cs |  74 ++++++++++++
 src/Umbraco.Web/Security/WebSecurity.cs       |  28 ++---
 src/Umbraco.Web/Umbraco.Web.csproj            |   4 +
 src/Umbraco.Web/UmbracoModule.cs              |  67 +----------
 .../UmbracoBackOfficeLogoutAttribute.cs       |  16 +--
 src/Umbraco.Web/umbraco.presentation/macro.cs |   4 +
 src/umbraco.businesslogic/StateHelper.cs      |   3 +-
 21 files changed, 356 insertions(+), 187 deletions(-)
 create mode 100644 src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationHandler.cs
 create mode 100644 src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationMiddleware.cs
 rename src/Umbraco.Web/Security/{Identity => }/OwinExtensions.cs (51%)
 create mode 100644 src/Umbraco.Web/Security/WebAuthExtensions.cs

diff --git a/src/Umbraco.Core/Constants-Web.cs b/src/Umbraco.Core/Constants-Web.cs
index 13dee96b97..60fba0ae40 100644
--- a/src/Umbraco.Core/Constants-Web.cs
+++ b/src/Umbraco.Core/Constants-Web.cs
@@ -1,4 +1,7 @@
-namespace Umbraco.Core
+using System;
+using System.ComponentModel;
+
+namespace Umbraco.Core
 {
 	public static partial class Constants
 	{		
@@ -15,6 +18,8 @@
             /// <summary>
             /// The auth cookie name
             /// </summary>
+            [Obsolete("DO NOT USE THIS, USE ISecuritySection.AuthCookieName, this will be removed in future versions")]
+            [EditorBrowsable(EditorBrowsableState.Never)]
             public const string AuthCookieName = "UMB_UCONTEXT";
 
         }
diff --git a/src/Umbraco.Core/Security/AuthenticationExtensions.cs b/src/Umbraco.Core/Security/AuthenticationExtensions.cs
index e332cb6dca..1c7c544ed8 100644
--- a/src/Umbraco.Core/Security/AuthenticationExtensions.cs
+++ b/src/Umbraco.Core/Security/AuthenticationExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -15,7 +16,6 @@ using Microsoft.Owin;
 using Newtonsoft.Json;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Membership;
-using Microsoft.Owin;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Security
@@ -157,9 +157,6 @@ namespace Umbraco.Core.Security
             return new HttpContextWrapper(http).GetCurrentIdentity(authenticateRequestIfNotFound);
         }
 
-        /// <summary>
-        /// This clears the forms authentication cookie
-        /// </summary>
         public static void UmbracoLogout(this HttpContextBase http)
         {
             if (http == null) throw new ArgumentNullException("http");
@@ -170,6 +167,8 @@ namespace Umbraco.Core.Security
         /// This clears the forms authentication cookie for webapi since cookies are handled differently
         /// </summary>
         /// <param name="response"></param>
+        [Obsolete("Use OWIN IAuthenticationManager.SignOut instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static void UmbracoLogoutWebApi(this HttpResponseMessage response)
         {
             if (response == null) throw new ArgumentNullException("response");
@@ -195,11 +194,8 @@ namespace Umbraco.Core.Security
             response.Headers.AddCookies(new[] { authCookie, prevCookie, extLoginCookie });
         }
 
-        /// <summary>
-        /// This adds the forms authentication cookie for webapi since cookies are handled differently
-        /// </summary>
-        /// <param name="response"></param>
-        /// <param name="user"></param>
+        [Obsolete("Use WebSecurity.SetPrincipalForRequest")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static FormsAuthenticationTicket UmbracoLoginWebApi(this HttpResponseMessage response, IUser user)
         {
             if (response == null) throw new ArgumentNullException("response");
@@ -250,26 +246,29 @@ namespace Umbraco.Core.Security
             if (http == null) throw new ArgumentNullException("http");
             new HttpContextWrapper(http).UmbracoLogout();
         }
-
+        
         /// <summary>
-        /// Renews the Umbraco authentication ticket
+        /// This will force ticket renewal in the OWIN pipeline
         /// </summary>
         /// <param name="http"></param>
         /// <returns></returns>
         public static bool RenewUmbracoAuthTicket(this HttpContextBase http)
         {
             if (http == null) throw new ArgumentNullException("http");
-            return RenewAuthTicket(http,
-                UmbracoConfig.For.UmbracoSettings().Security.AuthCookieName,
-                UmbracoConfig.For.UmbracoSettings().Security.AuthCookieDomain,
-                //Umbraco has always persisted it's original cookie for 1 day so we'll keep it that way
-                1440);
+            http.Items["umbraco-force-auth"] = true;
+            return true;
         }
 
+        /// <summary>
+        /// This will force ticket renewal in the OWIN pipeline
+        /// </summary>
+        /// <param name="http"></param>
+        /// <returns></returns>
         internal static bool RenewUmbracoAuthTicket(this HttpContext http)
         {
             if (http == null) throw new ArgumentNullException("http");
-            return new HttpContextWrapper(http).RenewUmbracoAuthTicket();
+            http.Items["umbraco-force-auth"] = true;
+            return true;
         }
 
         /// <summary>
@@ -390,8 +389,7 @@ namespace Umbraco.Core.Security
                     //ensure there's def an expired cookie
                     http.Response.Cookies.Add(new HttpCookie(c) { Expires = DateTime.Now.AddYears(-1) });
                 }               
-            }            
-
+            }
         }
 
         private static FormsAuthenticationTicket GetAuthTicket(this HttpContextBase http, string cookieName)
@@ -432,51 +430,6 @@ namespace Umbraco.Core.Security
             return FormsAuthentication.Decrypt(formsCookie);
         }
 
-        /// <summary>
-        /// Renews the forms authentication ticket & cookie
-        /// </summary>
-        /// <param name="http"></param>
-        /// <param name="cookieName"></param>
-        /// <param name="cookieDomain"></param>
-        /// <param name="minutesPersisted"></param>
-        /// <returns>true if there was a ticket to renew otherwise false if there was no ticket</returns>
-        private static bool RenewAuthTicket(this HttpContextBase http, string cookieName, string cookieDomain, int minutesPersisted)
-        {
-            if (http == null) throw new ArgumentNullException("http");
-            //get the ticket
-            var ticket = GetAuthTicket(http, cookieName);
-            //renew the ticket
-            var renewed = FormsAuthentication.RenewTicketIfOld(ticket);
-            if (renewed == null)
-            {
-                return false;
-            }
-
-            //get the request cookie to get it's expiry date, 
-            //NOTE: this will never be null becaues we already do this
-            // check in teh GetAuthTicket.
-            var formsCookie = http.Request.Cookies[cookieName];
-            
-            //encrypt it
-            var hash = FormsAuthentication.Encrypt(renewed);
-            //write it to the response
-            var cookie = new HttpCookie(cookieName, hash)
-                {                    
-                    Expires = DateTime.Now.AddMinutes(minutesPersisted),
-                    Domain = cookieDomain
-                };
-
-            if (GlobalSettings.UseSSL)
-                cookie.Secure = true;
-
-            //ensure http only, this should only be able to be accessed via the server
-            cookie.HttpOnly = true;
-
-            //rewrite the cooke
-            http.Response.Cookies.Set(cookie);
-            return true;
-        }
-
         /// <summary>
         /// Creates a custom FormsAuthentication ticket with the data specified
         /// </summary>
diff --git a/src/Umbraco.Core/Security/BackOfficeSignInManager.cs b/src/Umbraco.Core/Security/BackOfficeSignInManager.cs
index 85d6a0c715..f1d18b9d0f 100644
--- a/src/Umbraco.Core/Security/BackOfficeSignInManager.cs
+++ b/src/Umbraco.Core/Security/BackOfficeSignInManager.cs
@@ -53,6 +53,11 @@ namespace Umbraco.Core.Security
             switch (result)
             {
                 case SignInStatus.Success:
+                    _logger.WriteCore(TraceEventType.Information, 0,
+                        string.Format(
+                            "User: {0} logged in from IP address {1}",
+                            userName,
+                            _request.RemoteIpAddress), null, null);
                     break;
                 case SignInStatus.LockedOut:
                     _logger.WriteCore(TraceEventType.Information, 0,
diff --git a/src/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs b/src/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs
index 31bdb616b0..7f38bf61a1 100644
--- a/src/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs
+++ b/src/Umbraco.Tests/TestHelpers/FakeHttpContextFactory.cs
@@ -8,6 +8,7 @@ using System.Web;
 using System.Web.Routing;
 using Moq;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Tests.TestHelpers
 {
@@ -60,7 +61,7 @@ namespace Umbraco.Tests.TestHelpers
 
             //Cookie collection
 		    var cookieCollection = new HttpCookieCollection();
-            cookieCollection.Add(new HttpCookie(Constants.Web.AuthCookieName, "FBA996E7-D6BE-489B-B199-2B0F3D2DD826"));
+            cookieCollection.Add(new HttpCookie("UMB_UCONTEXT", "FBA996E7-D6BE-489B-B199-2B0F3D2DD826"));
 
 		    //Request
             var requestMock = new Mock<HttpRequestBase>();
diff --git a/src/Umbraco.Web/Editors/AuthenticationController.cs b/src/Umbraco.Web/Editors/AuthenticationController.cs
index 7f7b59199a..25b60c5cb7 100644
--- a/src/Umbraco.Web/Editors/AuthenticationController.cs
+++ b/src/Umbraco.Web/Editors/AuthenticationController.cs
@@ -177,19 +177,14 @@ namespace Umbraco.Web.Editors
                     //get the user
                     var user = Security.GetBackOfficeUser(loginModel.Username);
                     var userDetail = Mapper.Map<UserDetail>(user);
-
+                    //update the userDetail and set their remaining seconds
+                    userDetail.SecondsUntilTimeout = TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes).TotalSeconds;
+                    
                     //create a response with the userDetail object
                     var response = Request.CreateResponse(HttpStatusCode.OK, userDetail);
 
-                    //set the response cookies with the ticket (NOTE: This needs to be done with the custom webapi extension because
-                    // we cannot mix HttpContext.Response.Cookies and the way WebApi/Owin work)
-                    var ticket = response.UmbracoLoginWebApi(user);
-
-                    //This ensure the current principal is set, otherwise any logic executing after this wouldn't actually be authenticated
-                    http.Result.AuthenticateCurrentRequest(ticket, false);
-
-                    //update the userDetail and set their remaining seconds
-                    userDetail.SecondsUntilTimeout = ticket.GetRemainingAuthSeconds();
+                    //ensure the user is set for the current request
+                    Request.SetPrincipalForRequest(user);
 
                     return response;
 
@@ -241,11 +236,12 @@ namespace Umbraco.Web.Editors
         /// Logs the current user out
         /// </summary>
         /// <returns></returns>
-        [UmbracoBackOfficeLogout]
         [ClearAngularAntiForgeryToken]
         [ValidateAngularAntiForgeryToken]
         public HttpResponseMessage PostLogout()
         {
+            Request.TryGetOwinContext().Result.Authentication.SignOut();
+
             Logger.Info<AuthenticationController>("User {0} from IP address {1} has logged out",
                             () => User.Identity == null ? "UNKNOWN" : User.Identity.Name,
                             () => TryGetOwinContext().Result.Request.RemoteIpAddress);
diff --git a/src/Umbraco.Web/HttpCookieExtensions.cs b/src/Umbraco.Web/HttpCookieExtensions.cs
index dc6d087fb3..7aec1466da 100644
--- a/src/Umbraco.Web/HttpCookieExtensions.cs
+++ b/src/Umbraco.Web/HttpCookieExtensions.cs
@@ -3,6 +3,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Web;
+using Microsoft.Owin;
 using Umbraco.Core;
 
 namespace Umbraco.Web
@@ -62,6 +63,16 @@ namespace Umbraco.Web
             return request.Cookies[Constants.Web.PreviewCookieName] != null;
         }
 
+        /// <summary>
+        /// Does a preview cookie exist ?
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public static bool HasPreviewCookie(this IOwinRequest request)
+        {
+            return request.Cookies[Constants.Web.PreviewCookieName] != null;
+        }
+
         /// <summary>
         /// Does a cookie exist with the specified key ?
         /// </summary>
diff --git a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
index b8be5b7a22..6523925505 100644
--- a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
@@ -43,14 +43,8 @@ namespace Umbraco.Web.Install.InstallSteps
             var security = new WebSecurity(_httpContext, _applicationContext);
             security.PerformLogin(0);
 
-            ////Clear the auth cookie - this is required so that the login screen is displayed after upgrade and so the 
-            //// csrf anti-forgery tokens are created, otherwise there will just be JS errors if the user has an old 
-            //// login token from a previous version when we didn't have csrf tokens in place
-            //var security = new WebSecurity(new HttpContextWrapper(Context), ApplicationContext.Current);
-            //security.ClearCurrentLogin();
-
             //reports the ended install
-            InstallHelper ih = new InstallHelper(UmbracoContext.Current);
+            var ih = new InstallHelper(UmbracoContext.Current);
             ih.InstallStatus(true, "");
 
             return null;
diff --git a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
index d535bc4f8a..1668b6776d 100644
--- a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
@@ -155,7 +155,25 @@ namespace Umbraco.Web.Security.Identity
                 UmbracoConfig.For.UmbracoSettings().Security,
                 app.CreateLogger<GetUserSecondsMiddleWare>());
 
-            app.UseCookieAuthentication(authOptions);
+            app.UseUmbracoBackOfficeCookieAuthentication(authOptions);
+
+            return app;
+        }
+
+        internal static IAppBuilder UseUmbracoBackOfficeCookieAuthentication(this IAppBuilder app, CookieAuthenticationOptions options)
+        {
+            if (app == null)
+            {
+                throw new ArgumentNullException("app");
+            }
+
+            //First the normal cookie middleware
+            app.Use(typeof(CookieAuthenticationMiddleware), app, options);
+            app.UseStageMarker(PipelineStage.Authenticate);
+            
+            //Then our custom middleware
+            app.Use(typeof(ForceRenewalCookieAuthenticationMiddleware), app, options);
+            app.UseStageMarker(PipelineStage.Authenticate);
 
             return app;
         }
diff --git a/src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs b/src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
index 841c94c80c..06ce201ef9 100644
--- a/src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
+++ b/src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
@@ -1,6 +1,9 @@
-using Microsoft.Owin;
+using System;
+using System.Web;
+using Microsoft.Owin;
 using Microsoft.Owin.Infrastructure;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Security.Identity
 {
@@ -33,8 +36,8 @@ namespace Umbraco.Web.Security.Identity
                 return null;
             }
             
-            return UmbracoModule.ShouldAuthenticateRequest(
-                context.HttpContextFromOwinContext().Request, 
+            return ShouldAuthenticateRequest(
+                context, 
                 _umbracoContextAccessor.Value.OriginalRequestUrl) == false 
                 //Don't auth request, don't return a cookie
                 ? null 
@@ -42,5 +45,40 @@ namespace Umbraco.Web.Security.Identity
                 : base.GetRequestCookie(context, key);
         }
 
+        /// <summary>
+        /// Determines if we should authenticate the request
+        /// </summary>
+        /// <param name="ctx"></param>
+        /// <param name="originalRequestUrl"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// We auth the request when:
+        /// * it is a back office request
+        /// * it is an installer request
+        /// * it is a /base request
+        /// * it is a preview request
+        /// </remarks>
+        internal static bool ShouldAuthenticateRequest(IOwinContext ctx, Uri originalRequestUrl)
+        {
+            var request = ctx.Request;
+            var httpCtx = ctx.TryGetHttpContext();
+            
+            if (//check the explicit flag
+                ctx.Get<bool?>("umbraco-force-auth") != null
+                || (httpCtx.Success && httpCtx.Result.Items["umbraco-force-auth"] != null)
+                //check back office
+                || request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath)
+                //check installer
+                || request.Uri.IsInstallerRequest()
+                //detect in preview
+                || (request.HasPreviewCookie() && request.Uri != null && request.Uri.AbsolutePath.StartsWith(IOHelper.ResolveUrl(SystemDirectories.Umbraco)) == false)
+                //check for base
+                || BaseRest.BaseRestHandler.IsBaseRestRequest(originalRequestUrl))
+            {
+                return true;
+            }
+            return false;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationHandler.cs b/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationHandler.cs
new file mode 100644
index 0000000000..24beb708f7
--- /dev/null
+++ b/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationHandler.cs
@@ -0,0 +1,112 @@
+using System.Threading.Tasks;
+using Microsoft.Owin;
+using Microsoft.Owin.Security;
+using Microsoft.Owin.Security.Cookies;
+using Microsoft.Owin.Security.Infrastructure;
+
+namespace Umbraco.Web.Security.Identity
+{
+    /// <summary>
+    /// If a flag is set on the context to force renew the ticket, this will do it
+    /// </summary>
+    internal class ForceRenewalCookieAuthenticationHandler : AuthenticationHandler<CookieAuthenticationOptions>
+    {
+        /// <summary>
+        /// This handler doesn't actually do any auth so we return null;
+        /// </summary>
+        /// <returns></returns>
+        protected override Task<AuthenticationTicket> AuthenticateCoreAsync()
+        {
+            return Task.FromResult((AuthenticationTicket)null);
+        }
+
+        /// <summary>
+        /// Gets the ticket from the request
+        /// </summary>
+        /// <returns></returns>
+        private AuthenticationTicket GetTicket()
+        {
+            var cookie = Options.CookieManager.GetRequestCookie(Context, Options.CookieName);
+            if (string.IsNullOrWhiteSpace(cookie))
+            {
+                return null;
+            }
+            var ticket = Options.TicketDataFormat.Unprotect(cookie);
+            if (ticket == null)
+            {
+                return null;
+            }
+            return ticket;
+        }
+
+        /// <summary>
+        /// This will check if the token exists in the request to force renewal
+        /// </summary>
+        /// <returns></returns>
+        protected override Task ApplyResponseGrantAsync()
+        {
+            //Now we need to check if we should force renew this based on a flag in the context
+
+            var httpCtx = Context.TryGetHttpContext();
+            //check for the special flag in either the owin or http context
+            var shouldRenew = Context.Get<bool?>("umbraco-force-auth") != null || (httpCtx.Success && httpCtx.Result.Items["umbraco-force-auth"] != null);
+            
+            if (shouldRenew)
+            {
+                var signin = Helper.LookupSignIn(Options.AuthenticationType);
+                var shouldSignin = signin != null;
+                var signout = Helper.LookupSignOut(Options.AuthenticationType, Options.AuthenticationMode);
+                var shouldSignout = signout != null;
+
+                //we don't care about the sign in/sign out scenario, only renewal
+                if (shouldSignin == false && shouldSignout == false)
+                {
+                    //get the ticket
+                    var model = GetTicket();
+                    if (model != null)
+                    {
+                        var currentUtc = Options.SystemClock.UtcNow;
+                        var issuedUtc = model.Properties.IssuedUtc;
+                        var expiresUtc = model.Properties.ExpiresUtc;
+
+                        if (expiresUtc.HasValue && issuedUtc.HasValue)
+                        {
+                            //renew the date/times
+                            model.Properties.IssuedUtc = currentUtc;
+                            var timeSpan = expiresUtc.Value.Subtract(issuedUtc.Value);
+                            model.Properties.ExpiresUtc = currentUtc.Add(timeSpan);
+
+                            //now save back all the required cookie details
+                            var cookieValue = Options.TicketDataFormat.Protect(model);
+                            var cookieOptions = new CookieOptions
+                            {
+                                Domain = Options.CookieDomain,
+                                HttpOnly = Options.CookieHttpOnly,
+                                Path = Options.CookiePath ?? "/",
+                            };
+                            if (Options.CookieSecure == CookieSecureOption.SameAsRequest)
+                            {
+                                cookieOptions.Secure = Request.IsSecure;
+                            }
+                            else
+                            {
+                                cookieOptions.Secure = Options.CookieSecure == CookieSecureOption.Always;
+                            }
+                            if (model.Properties.IsPersistent)
+                            {
+                                cookieOptions.Expires = model.Properties.ExpiresUtc.Value.ToUniversalTime().DateTime;
+                            }
+                            Options.CookieManager.AppendResponseCookie(
+                                Context,
+                                Options.CookieName,
+                                cookieValue,
+                                cookieOptions);
+                        }
+                    }
+                }
+            }
+
+            return Task.FromResult(0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationMiddleware.cs b/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationMiddleware.cs
new file mode 100644
index 0000000000..e159a1c847
--- /dev/null
+++ b/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationMiddleware.cs
@@ -0,0 +1,22 @@
+using Microsoft.Owin;
+using Microsoft.Owin.Security.Cookies;
+using Microsoft.Owin.Security.Infrastructure;
+using Owin;
+
+namespace Umbraco.Web.Security.Identity
+{
+    /// <summary>
+    /// This middleware is used simply to force renew the auth ticket if a flag to do so is found in the request
+    /// </summary>
+    internal class ForceRenewalCookieAuthenticationMiddleware : CookieAuthenticationMiddleware
+    {
+        public ForceRenewalCookieAuthenticationMiddleware(OwinMiddleware next, IAppBuilder app, CookieAuthenticationOptions options) : base(next, app, options)
+        {
+        }        
+
+        protected override AuthenticationHandler<CookieAuthenticationOptions> CreateHandler()
+        {
+            return new ForceRenewalCookieAuthenticationHandler();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
index 85cab39120..c3ce720fa5 100644
--- a/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
@@ -98,13 +98,13 @@ namespace Umbraco.Web.Security.Identity
 
                             remainingSeconds = (ticket.Properties.ExpiresUtc.Value - DateTime.Now.ToUniversalTime()).TotalSeconds;
                         }
-                        else if (remainingSeconds <=30) 
+                        else if (remainingSeconds <= 30)
                         {
                             //NOTE: We are using 30 seconds because that is what is coded into angular to force logout to give some headway in
                             // the timeout process.
 
                             _logger.WriteCore(TraceEventType.Information, 0,
-                                string.Format("User logged will be logged out due to timeout: {0}, IP Address: {1}", ticket.Identity.Name, request.RemoteIpAddress), 
+                                string.Format("User logged will be logged out due to timeout: {0}, IP Address: {1}", ticket.Identity.Name, request.RemoteIpAddress),
                                 null, null);
                         }
 
diff --git a/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs b/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
index 9a55e42b51..957cb66b0a 100644
--- a/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
+++ b/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Web.Security.Identity
             }
             
             SlidingExpiration = true;
-            ExpireTimeSpan = TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes);
+            ExpireTimeSpan = TimeSpan.FromMinutes(LoginTimeoutMinutes);
             CookieDomain = securitySection.AuthCookieDomain;
             CookieName = securitySection.AuthCookieName;
             CookieHttpOnly = true;
diff --git a/src/Umbraco.Web/Security/Identity/OwinExtensions.cs b/src/Umbraco.Web/Security/OwinExtensions.cs
similarity index 51%
rename from src/Umbraco.Web/Security/Identity/OwinExtensions.cs
rename to src/Umbraco.Web/Security/OwinExtensions.cs
index ceb0bdafb2..d1f1fbc1ed 100644
--- a/src/Umbraco.Web/Security/Identity/OwinExtensions.cs
+++ b/src/Umbraco.Web/Security/OwinExtensions.cs
@@ -1,7 +1,8 @@
-using System.Web;
+using System.Web;
 using Microsoft.Owin;
+using Umbraco.Core;
 
-namespace Umbraco.Web.Security.Identity
+namespace Umbraco.Web.Security
 {
     internal static class OwinExtensions
     {
@@ -11,9 +12,10 @@ namespace Umbraco.Web.Security.Identity
         /// </summary>
         /// <param name="owinContext"></param>
         /// <returns></returns>
-        internal static HttpContextBase HttpContextFromOwinContext(this IOwinContext owinContext)
+        internal static Attempt<HttpContextBase> TryGetHttpContext(this IOwinContext owinContext)
         {
-            return owinContext.Get<HttpContextBase>(typeof(HttpContextBase).FullName);
+            var ctx = owinContext.Get<HttpContextBase>(typeof(HttpContextBase).FullName);
+            return ctx == null ? Attempt<HttpContextBase>.Fail() : Attempt.Succeed(ctx);
         }
 
     }
diff --git a/src/Umbraco.Web/Security/WebAuthExtensions.cs b/src/Umbraco.Web/Security/WebAuthExtensions.cs
new file mode 100644
index 0000000000..ec43244b6e
--- /dev/null
+++ b/src/Umbraco.Web/Security/WebAuthExtensions.cs
@@ -0,0 +1,74 @@
+using System.Net.Http;
+using System.Security.Claims;
+using System.Security.Principal;
+using System.ServiceModel.Channels;
+using System.Threading;
+using System.Web;
+using AutoMapper;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Security;
+using Umbraco.Web.WebApi;
+
+namespace Umbraco.Web.Security
+{
+    internal static class WebAuthExtensions
+    {
+        /// <summary>
+        /// This will set a an authenticated IPrincipal to the current request given the IUser object
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        internal static IPrincipal SetPrincipalForRequest(this HttpRequestMessage request, IUser user)
+        {
+            var principal = new ClaimsPrincipal(
+                new UmbracoBackOfficeIdentity(
+                    new ClaimsIdentity(),
+                    Mapper.Map<UserData>(user)));
+
+            //It is actually not good enough to set this on the current app Context and the thread, it also needs
+            // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually 
+            // an underlying fault of asp.net not propogating the User correctly.
+            if (HttpContext.Current != null)
+            {
+                HttpContext.Current.User = principal;
+            }
+            var http = request.TryGetHttpContext();
+            if (http)
+            {
+                http.Result.User = principal;
+            }
+            Thread.CurrentPrincipal = principal;
+
+            //For WebAPI
+            request.SetUserPrincipal(principal);
+
+            return principal;
+        }
+
+        /// <summary>
+        /// This will set a an authenticated IPrincipal to the current request given the IUser object
+        /// </summary>
+        /// <param name="httpContext"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        internal static IPrincipal SetPrincipalForRequest(this HttpContextBase httpContext, IUser user)
+        {
+            var principal = new ClaimsPrincipal(
+                new UmbracoBackOfficeIdentity(
+                    new ClaimsIdentity(),
+                    Mapper.Map<UserData>(user)));
+
+            //It is actually not good enough to set this on the current app Context and the thread, it also needs
+            // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually 
+            // an underlying fault of asp.net not propogating the User correctly.
+            if (HttpContext.Current != null)
+            {
+                HttpContext.Current.User = principal;
+            }
+            httpContext.User = principal;
+            Thread.CurrentPrincipal = principal;
+            return principal;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index d3d6f76999..1e986dccfc 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Web;
 using System.Web.Security;
@@ -8,8 +9,9 @@ using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Security;
-using umbraco;
+using Microsoft.AspNet.Identity.Owin;
 using umbraco.businesslogic.Exceptions;
+using Umbraco.Web.Models.ContentEditing;
 using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
 using User = umbraco.BusinessLogic.User;
 
@@ -84,32 +86,27 @@ namespace Umbraco.Web.Security
         /// <returns>returns the number of seconds until their session times out</returns>
         public virtual double PerformLogin(int userId)
         {
+            var owinCtx = _httpContext.GetOwinContext();
+            
             var user = _applicationContext.Services.UserService.GetUserById(userId);
-            return PerformLogin(user).GetRemainingAuthSeconds();
+            var userDetail = Mapper.Map<UserDetail>(user);
+            //update the userDetail and set their remaining seconds
+            userDetail.SecondsUntilTimeout = TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes).TotalSeconds;            
+            var principal = _httpContext.SetPrincipalForRequest(user);
+            owinCtx.Authentication.SignIn((UmbracoBackOfficeIdentity)principal.Identity);
+            return TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes).TotalSeconds;
         }
 
-        /// <summary>
-        /// Logs the user in
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns>returns the Forms Auth ticket created which is used to log them in</returns>
+        [Obsolete("This method should not be used, login is performed by the OWIN pipeline, use the overload that returns double and accepts a UserId instead")]
         public virtual FormsAuthenticationTicket PerformLogin(IUser user)
         {
-            //clear the external cookie - we do this without owin context because we're writing cookies directly to httpcontext 
-            // and cookie handling is different with httpcontext vs webapi and owin, normally we'd do:
-            //_httpContext.GetOwinContext().Authentication.SignOut(Constants.Security.BackOfficeExternalAuthenticationType);
-
             var externalLoginCookie = _httpContext.Request.Cookies.Get(Constants.Security.BackOfficeExternalCookieName);
             if (externalLoginCookie != null)
             {
                 externalLoginCookie.Expires = DateTime.Now.AddYears(-1);
                 _httpContext.Response.Cookies.Set(externalLoginCookie);
             }
-
             var ticket = _httpContext.CreateUmbracoAuthTicket(Mapper.Map<UserData>(user));
-            
-            LogHelper.Info<WebSecurity>("User Id: {0} logged in", () => user.Id);
-
             return ticket;
         }
 
@@ -119,6 +116,7 @@ namespace Umbraco.Web.Security
         public virtual void ClearCurrentLogin()
         {
             _httpContext.UmbracoLogout();
+            _httpContext.GetOwinContext().Authentication.SignOut();
         }
 
         /// <summary>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 7a4c6a4cd0..b67b410801 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -308,11 +308,15 @@
     <Compile Include="RequestLifespanMessagesFactory.cs" />
     <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
     <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
+    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
+    <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
     <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
     <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />
     <Compile Include="Media\EmbedProviders\OEmbedResponse.cs" />
     <Compile Include="Media\EmbedProviders\OEmbedPhoto.cs" />
     <Compile Include="Security\Identity\IUmbracoBackOfficeTwoFactorOptions.cs" />
+    <Compile Include="Security\OwinExtensions.cs" />
+    <Compile Include="Security\WebAuthExtensions.cs" />
     <Compile Include="UmbracoDefaultOwinStartup.cs" />
     <Compile Include="IUmbracoContextAccessor.cs" />
     <Compile Include="Models\ContentEditing\Relation.cs" />
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index 02bb83bd32..a7c41ba90f 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -149,72 +149,7 @@ namespace Umbraco.Web
 		#endregion
 
 		#region Methods
-
-        /// <summary>
-        /// Determines if we should authenticate the request
-        /// </summary>
-        /// <param name="request"></param>
-        /// <param name="originalRequestUrl"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// We auth the request when:
-        /// * it is a back office request
-        /// * it is an installer request
-        /// * it is a /base request
-        /// * it is a preview request
-        /// </remarks>
-        internal static bool ShouldAuthenticateRequest(HttpRequestBase request, Uri originalRequestUrl)
-        {
-            if (//check back office
-                request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath)
-                //check installer
-                || request.Url.IsInstallerRequest()
-                //detect in preview
-                || (request.HasPreviewCookie() && request.Url != null && request.Url.AbsolutePath.StartsWith(IOHelper.ResolveUrl(SystemDirectories.Umbraco)) == false)
-                //check for base
-                || BaseRest.BaseRestHandler.IsBaseRestRequest(originalRequestUrl))
-            {
-                return true;
-            }
-            return false;
-        }
-
-        //private static readonly ConcurrentHashSet<string> IgnoreTicketRenewUrls = new ConcurrentHashSet<string>(); 
-        ///// <summary>
-        ///// Determines if the authentication ticket should be renewed with a new timeout
-        ///// </summary>
-        ///// <param name="url"></param>
-        ///// <param name="httpContext"></param>
-        ///// <returns></returns>
-        ///// <remarks>
-        ///// We do not want to renew the ticket when we are checking for the user's remaining timeout unless -
-        ///// UmbracoConfig.For.UmbracoSettings().Security.KeepUserLoggedIn == true
-        ///// </remarks>
-        //internal static bool ShouldIgnoreTicketRenew(Uri url, HttpContextBase httpContext)
-        //{
-        //    //this setting will renew the ticket for all requests.
-        //    if (UmbracoConfig.For.UmbracoSettings().Security.KeepUserLoggedIn)
-        //    {
-        //        return false;
-        //    }
-
-        //    //initialize the ignore ticket urls - we don't need to lock this, it's concurrent and a hashset
-        //    // we don't want to have to gen the url each request so this will speed things up a teeny bit.
-        //    if (IgnoreTicketRenewUrls.Any() == false)
-        //    {                
-        //        var urlHelper = new UrlHelper(new RequestContext(httpContext, new RouteData()));
-        //        var checkSessionUrl = urlHelper.GetUmbracoApiService<AuthenticationController>(controller => controller.GetRemainingTimeoutSeconds());
-        //        IgnoreTicketRenewUrls.Add(checkSessionUrl);
-        //    }
-
-        //    if (IgnoreTicketRenewUrls.Any(x => url.AbsolutePath.StartsWith(x)))
-        //    {
-        //        return true;
-        //    }
-
-        //    return false;            
-        //}
-
+        
 		/// <summary>
 		/// Checks the current request and ensures that it is routable based on the structure of the request and URI
 		/// </summary>		
diff --git a/src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs b/src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs
index 336d8bb403..29ed4da73e 100644
--- a/src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/UmbracoBackOfficeLogoutAttribute.cs
@@ -1,16 +1,12 @@
-using System.Web.Http.Filters;
+using System;
+using System.ComponentModel;
+using System.Web.Http.Filters;
 using Umbraco.Core.Security;
 
 namespace Umbraco.Web.WebApi.Filters
 {
-    /// <summary>
-    /// A filter that is used to remove the authorization cookie for the current user when the request is successful
-    /// </summary>
-    /// <remarks>
-    /// This is used so that we can log a user OUT in conjunction with using other filters that modify the cookies collection.
-    /// SD: I beleive this is a bug with web api since if you modify the cookies collection on the HttpContext.Current and then 
-    /// use a filter to write the cookie headers, the filter seems to have no affect at all.
-    /// </remarks>
+    [Obsolete("This is no longer used and will be removed from the codebase in the future, use OWIN IAuthenticationManager.SignOut instead")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
     public sealed class UmbracoBackOfficeLogoutAttribute : ActionFilterAttribute
     {
         public override void OnActionExecuted(HttpActionExecutedContext context)
@@ -20,7 +16,7 @@ namespace Umbraco.Web.WebApi.Filters
 
             //this clears out all of our cookies
             context.Response.UmbracoLogoutWebApi();
-
+            
             //this calls the underlying owin sign out logic - which should call the 
             // auth providers middleware callbacks if using custom auth middleware
             context.Request.TryGetOwinContext().Result.Authentication.SignOut();
diff --git a/src/Umbraco.Web/umbraco.presentation/macro.cs b/src/Umbraco.Web/umbraco.presentation/macro.cs
index 53bdaaa9de..19768d15b5 100644
--- a/src/Umbraco.Web/umbraco.presentation/macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/macro.cs
@@ -1705,6 +1705,10 @@ namespace umbraco
 
                 // propagate the user's context
                 // zb-00004 #29956 : refactor cookies names & handling
+
+                //TODO: This is the worst thing ever. This will also not work if people decide to put their own
+                // custom auth system in place.
+
                 HttpCookie inCookie = StateHelper.Cookies.UserContext.RequestCookie;
                 var cookie = new Cookie(inCookie.Name, inCookie.Value, inCookie.Path,
                                         HttpContext.Current.Request.ServerVariables["SERVER_NAME"]);
diff --git a/src/umbraco.businesslogic/StateHelper.cs b/src/umbraco.businesslogic/StateHelper.cs
index e84d3aa129..61df4318ab 100644
--- a/src/umbraco.businesslogic/StateHelper.cs
+++ b/src/umbraco.businesslogic/StateHelper.cs
@@ -3,6 +3,7 @@ using System.Reflection;
 using System.Web;
 using System.Web.UI;
 using Umbraco.Core;
+using Umbraco.Core.Configuration;
 
 namespace umbraco.BusinessLogic
 {
@@ -350,7 +351,7 @@ namespace umbraco.BusinessLogic
              * that actually make sense? shouldn't some cookie have _no_ expires?
              */
             static readonly Cookie _preview = new Cookie(Constants.Web.PreviewCookieName, TimeSpan.Zero); // was "PreviewSet"
-            static readonly Cookie _userContext = new Cookie(Constants.Web.AuthCookieName, 30d); // was "UserContext"
+            static readonly Cookie _userContext = new Cookie(UmbracoConfig.For.UmbracoSettings().Security.AuthCookieName, 30d); // was "UserContext"
             static readonly Cookie _member = new Cookie("UMB_MEMBER", 30d); // was "umbracoMember"
 
             public static Cookie Preview { get { return _preview; } }

From 5e8e62cbf7259e90e2f1c7ee34ebe488a28ea1c2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 19 Nov 2015 18:29:11 +0100
Subject: [PATCH 33/68] missing csproj save

---
 src/Umbraco.Web/Umbraco.Web.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index b67b410801..916d636926 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -573,7 +573,6 @@
     <Compile Include="Security\Identity\AuthenticationManagerExtensions.cs" />
     <Compile Include="Security\Identity\BackOfficeCookieManager.cs" />
     <Compile Include="Security\Identity\FormsAuthenticationSecureDataFormat.cs" />
-    <Compile Include="Security\Identity\OwinExtensions.cs" />
     <Compile Include="Security\Identity\UmbracoBackOfficeCookieAuthOptions.cs" />
     <Compile Include="Scheduling\TaskAndFactoryExtensions.cs" />
     <Compile Include="SingletonUmbracoContextAccessor.cs" />

From 4c544acb42e965a2f7b3d033bed00c1363156bc9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 19 Nov 2015 19:21:55 +0100
Subject: [PATCH 34/68] fixes links so that working with vdirs works too.

---
 src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
index d920d4509c..b9a0cabdae 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -212,7 +212,7 @@ namespace Umbraco.Web.Models.Mapping
 
                         var currentDocumentTypeId = currentDocumentType == null ? string.Empty : currentDocumentType.Id.ToString(CultureInfo.InvariantCulture);
                         //TODO: Hard coding this is not good
-                        var docTypeLink = string.Format("#/settings/framed/%252Fumbraco%252Fsettings%252FeditNodeTypeNew.aspx%253Fid%253D{0}", currentDocumentTypeId);
+                        var docTypeLink = string.Format("#/settings/framed/settings%252FeditNodeTypeNew.aspx%253Fid%253D{0}", currentDocumentTypeId);
 
                         //Replace the doc type property
                         var docTypeProp = genericProperties.First(x => x.Alias == string.Format("{0}doctype", Constants.PropertyEditors.InternalGenericPropertiesPrefix));

From a885840b9fdd64cdc04e54a23dbc02d4e060726a Mon Sep 17 00:00:00 2001
From: bjarnef <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 19 Nov 2015 21:55:54 +0100
Subject: [PATCH 35/68] Move Umbraco version label to header in user dialog

---
 src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
index f80fc0bdc2..02cc88a845 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
@@ -8,17 +8,16 @@
             </div>
         </div>
         <h1 class="headline">{{user.name}}</h1>
+        <small class="umb-version">Umbraco version {{version}}</small>
         <p class="muted">
             <small>
                 <localize key="user_sessionExpires" />: {{remainingAuthSeconds | timespan}}
             </small>
         </p>
-
     </div>
 
     <div class="umb-panel-body umb-scrollable">
         <div class="tab-content umb-control-group">
-            
  
             <div class="umb-pane">
                 <h5><localize key="user_yourProfile" /></h5>
@@ -100,7 +99,5 @@
             </div>
 
         </div>
-
-        <small class="umb-version">Umbraco version {{version}}</small>
     </div>
 </div>

From 95217422546ba71227bfaa550cc3a291a8b357b8 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Fri, 20 Nov 2015 13:17:28 +0100
Subject: [PATCH 36/68] Fixes to MultiNodePicker when using media.

---
 .../contentpicker/contentpicker.controller.js |  1 +
 .../contentpicker/contentpicker.html          |  6 ++---
 .../ContentPickerPropertyEditor.cs            |  2 +-
 .../MultiNodeTreePickerPropertyEditor.cs      | 23 +++++++++++--------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index dc15f49850..2bdbe4796b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -76,6 +76,7 @@ function contentPickerController($scope, dialogService, entityResource, editorSt
         ? "Media"
         : "Document";
     $scope.allowOpenButton = entityType === "Document" || entityType === "Media";
+    $scope.allowEditButton = entityType === "Document";
 
     //the dialog options for the picker
     var dialogOptions = {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index b27da0bac2..86674abfe7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -13,9 +13,9 @@
                     {{node.name}}
                 </a>
                 
-                <div ng-if="!dialogEditor && ((model.config.showOpenButton && allowOpenButton) || model.config.showEditButton)">
-                    <small ng-if="model.config.showOpenButton && allowOpenButton"><a href ng-click="showNode($index)" ng-attr-title="{{model.config.showPathOnHover && 'Path: ' + node.path || undefined}}"><localize key="open">Open</localize></a></small>
-                    <small ng-if="model.config.showEditButton"><a href umb-launch-mini-editor="node"><localize key="edit">Edit</localize></a></small>
+                <div ng-if="!dialogEditor && ((model.config.showOpenButton && allowOpenButton) || (model.config.showEditButton && allowEditButton))">
+                    <small ng-if="model.config.showOpenButton && allowOpenButton"><a href ng-click="showNode($index)"><localize key="open">Open</localize></a></small>
+                    <small ng-if="model.config.showEditButton && allowEditButton"><a href umb-launch-mini-editor="node"><localize key="edit">Edit</localize></a></small>
                 </div>
             </li>
         </ul>
diff --git a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
index 605e4e49bf..f4433899f5 100644
--- a/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
@@ -12,9 +12,9 @@ namespace Umbraco.Web.PropertyEditors
         {
             _internalPreValues = new Dictionary<string, object>
             {
+                {"startNodeId", "-1"},
                 {"showOpenButton", "0"},
                 {"showEditButton", "0"},
-                {"startNodeId", "-1"},
                 {"showPathOnHover", "0"}
             };
         }
diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
index 673e721b70..1dd9204df9 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Umbraco.Core;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
@@ -15,10 +11,12 @@ namespace Umbraco.Web.PropertyEditors
         public MultiNodeTreePickerPropertyEditor()
         {
             _internalPreValues = new Dictionary<string, object>
-                {
-                    {"multiPicker", "1"},
-                    {"showEditButton", "0"}
-                };
+            {
+                {"multiPicker", "1"},
+                {"showOpenButton", "0"},
+                {"showEditButton", "0"},
+                {"showPathOnHover", "0"}
+            };
         }
         
         protected override PreValueEditor CreatePreValueEditor()
@@ -47,9 +45,16 @@ namespace Umbraco.Web.PropertyEditors
             [PreValueField("maxNumber", "Maximum number of items", "number")]
             public string MaxNumber { get; set; }
 
+
+            [PreValueField("showOpenButton", "Show open button", "boolean")]
+            public string ShowOpenButton { get; set; }
+
             [PreValueField("showEditButton", "Show edit button (this feature is in preview!)", "boolean")]
             public string ShowEditButton { get; set; }
 
+            [PreValueField("showPathOnHover", "Show path when hovering items", "boolean")]
+            public bool ShowPathOnHover { get; set; }
+
             /// <summary>
             /// This ensures the multiPicker pre-val is set based on the maxNumber of nodes set
             /// </summary>

From 31dc1b2cdbcf52ea92b9635b56b35b8447df9d80 Mon Sep 17 00:00:00 2001
From: engern <tommy_enger@hotmail.com>
Date: Sat, 21 Nov 2015 13:20:13 +0100
Subject: [PATCH 37/68] Fixes U46340

---
 .../src/common/resources/macro.resource.js    | 21 ++++++-------------
 src/Umbraco.Web/Editors/MacroController.cs    |  4 +++-
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
index 9ba64838c9..af0d5292c6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
@@ -36,7 +36,7 @@ function macroResource($q, $http, umbRequestHelper) {
          * @methodOf umbraco.resources.macroResource
          *
          * @description
-         * Gets the result of a macro as html to display in the rich text editor
+         * Gets the result of a macro as html to display in the rich text editor or in the Grid
          *
          * @param {int} macroId The macro id to get parameters for
          * @param {int} pageId The current page id
@@ -47,37 +47,28 @@ function macroResource($q, $http, umbRequestHelper) {
 
             //need to format the query string for the custom dictionary
             var query = "macroAlias=" + macroAlias + "&pageId=" + pageId;
+            var macroParams = {};
             if (macroParamDictionary) {
-                var counter = 0;
                 _.each(macroParamDictionary, function (val, key) {
                     //check for null
                     val = val ? val : "";
                     //need to detect if the val is a string or an object
                     if (!angular.isString(val)) {
                         //if it's not a string we'll send it through the json serializer
-                        var json = angular.toJson(val);
-                        //then we need to url encode it so that it's safe
-                        val = encodeURIComponent(json);
+                        val = angular.toJson(val);
                     }
-                    else {
-                        //we still need to encode the string, it could contain line breaks, etc...
-                        val = encodeURIComponent(val);
-                    }
-
-                    query += "&macroParams[" + counter + "].key=" + key + "&macroParams[" + counter + "].value=" + val;
-                    counter++;
+                    macroParams[key] = val;
                 });
             }
 
             return umbRequestHelper.resourcePromise(
-               $http.get(
+               $http.post(
                    umbRequestHelper.getApiUrl(
                        "macroApiBaseUrl",
                        "GetMacroResultAsHtmlForEditor",
-                       query)),
+                       query), JSON.stringify(macroParams)),
                'Failed to retrieve macro result for macro with alias  ' + macroAlias);
         }
-            
     };
 }
 
diff --git a/src/Umbraco.Web/Editors/MacroController.cs b/src/Umbraco.Web/Editors/MacroController.cs
index 11fef4a25d..e14971db36 100644
--- a/src/Umbraco.Web/Editors/MacroController.cs
+++ b/src/Umbraco.Web/Editors/MacroController.cs
@@ -49,7 +49,9 @@ namespace Umbraco.Web.Editors
         /// 
         /// </param>
         /// <returns></returns>
-        public HttpResponseMessage GetMacroResultAsHtmlForEditor(string macroAlias, int pageId, [FromUri]IDictionary<string, object> macroParams)
+        [HttpPost]
+        [HttpGet]
+        public HttpResponseMessage GetMacroResultAsHtmlForEditor(string macroAlias, int pageId, [FromBody]IDictionary<string, object> macroParams)
         {
             // note - here we should be using the cache, provided that the preview content is in the cache...
 

From 54ab26e2ed61864ff8a26c60f5c80a2d3c6640fa Mon Sep 17 00:00:00 2001
From: engern <tommy_enger@hotmail.com>
Date: Sat, 21 Nov 2015 14:00:58 +0100
Subject: [PATCH 38/68] Simplifying thge code even further

Realized that we don't need to convert the exisitng dictionary to a new
dictionary.
---
 .../src/common/resources/macro.resource.js       | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
index af0d5292c6..e4201c6d3e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
@@ -45,28 +45,14 @@ function macroResource($q, $http, umbRequestHelper) {
          */
         getMacroResultAsHtmlForEditor: function (macroAlias, pageId, macroParamDictionary) {
 
-            //need to format the query string for the custom dictionary
             var query = "macroAlias=" + macroAlias + "&pageId=" + pageId;
-            var macroParams = {};
-            if (macroParamDictionary) {
-                _.each(macroParamDictionary, function (val, key) {
-                    //check for null
-                    val = val ? val : "";
-                    //need to detect if the val is a string or an object
-                    if (!angular.isString(val)) {
-                        //if it's not a string we'll send it through the json serializer
-                        val = angular.toJson(val);
-                    }
-                    macroParams[key] = val;
-                });
-            }
 
             return umbRequestHelper.resourcePromise(
                $http.post(
                    umbRequestHelper.getApiUrl(
                        "macroApiBaseUrl",
                        "GetMacroResultAsHtmlForEditor",
-                       query), JSON.stringify(macroParams)),
+                       query), JSON.stringify(macroParamDictionary)),
                'Failed to retrieve macro result for macro with alias  ' + macroAlias);
         }
     };

From c9f57c6ce31ccba73d4bdd4cc530fd88ccb79e01 Mon Sep 17 00:00:00 2001
From: Tommy Enger <tommy_enger@hotmail.com>
Date: Mon, 23 Nov 2015 15:52:36 +0100
Subject: [PATCH 39/68] Split Get and Post

Split Get and Post into 2 separate methods to maintain backwards
compability
---
 .../src/common/resources/macro.resource.js    |  2 +-
 src/Umbraco.Web/Editors/MacroController.cs    | 64 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
index e4201c6d3e..c8dc62fc6c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
@@ -51,7 +51,7 @@ function macroResource($q, $http, umbRequestHelper) {
                $http.post(
                    umbRequestHelper.getApiUrl(
                        "macroApiBaseUrl",
-                       "GetMacroResultAsHtmlForEditor",
+                       "GetMacroResultAsHtmlForEditorUsingHttpPost",
                        query), JSON.stringify(macroParamDictionary)),
                'Failed to retrieve macro result for macro with alias  ' + macroAlias);
         }
diff --git a/src/Umbraco.Web/Editors/MacroController.cs b/src/Umbraco.Web/Editors/MacroController.cs
index e14971db36..fed4fe6805 100644
--- a/src/Umbraco.Web/Editors/MacroController.cs
+++ b/src/Umbraco.Web/Editors/MacroController.cs
@@ -49,9 +49,8 @@ namespace Umbraco.Web.Editors
         /// 
         /// </param>
         /// <returns></returns>
-        [HttpPost]
         [HttpGet]
-        public HttpResponseMessage GetMacroResultAsHtmlForEditor(string macroAlias, int pageId, [FromBody]IDictionary<string, object> macroParams)
+        public HttpResponseMessage GetMacroResultAsHtmlForEditor(string macroAlias, int pageId, [FromUri] IDictionary<string, object> macroParams)
         {
             // note - here we should be using the cache, provided that the preview content is in the cache...
 
@@ -83,7 +82,66 @@ namespace Umbraco.Web.Editors
             //the 'easiest' way might be to create an IPublishedContent manually and populate the legacy 'page' object with that
             //and then set the legacy parameters.
 
-            var legacyPage = new global::umbraco.page(doc);                    
+            var legacyPage = new global::umbraco.page(doc);
+            UmbracoContext.HttpContext.Items["pageID"] = doc.Id;
+            UmbracoContext.HttpContext.Items["pageElements"] = legacyPage.Elements;
+            UmbracoContext.HttpContext.Items[global::Umbraco.Core.Constants.Conventions.Url.AltTemplate] = null;
+
+            var renderer = new UmbracoComponentRenderer(UmbracoContext);
+
+            var result = Request.CreateResponse();
+            //need to create a specific content result formatted as html since this controller has been configured
+            //with only json formatters.
+            result.Content = new StringContent(
+                renderer.RenderMacro(macro, macroParams, legacyPage).ToString(),
+                Encoding.UTF8,
+                "text/html");
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a rendered macro as html for rendering in the rich text editor.
+        /// Using HTTP POST instead of GET allows for more parameters to be passed as it's not dependant on URL-length limitations like GET.
+        /// The method using GET is kept to maintain backwards compatibility
+        /// </summary>
+        /// <param name="macroAlias"></param>
+        /// <param name="pageId"></param>
+        /// <param name="macroParams"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public HttpResponseMessage GetMacroResultAsHtmlForEditorUsingHttpPost(string macroAlias, int pageId, [FromBody]IDictionary<string, object> macroParams)
+        {
+            // note - here we should be using the cache, provided that the preview content is in the cache...
+
+            var doc = Services.ContentService.GetById(pageId);
+            if (doc == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            //need to get a legacy macro object - eventually we'll have a new format but nto yet
+            var macro = new macro(macroAlias);
+            if (macro == null)
+            {
+                throw new HttpResponseException(HttpStatusCode.NotFound);
+            }
+
+            //if it isn't supposed to be rendered in the editor then return an empty string
+            if (macro.DontRenderInEditor)
+            {
+                var response = Request.CreateResponse();
+                //need to create a specific content result formatted as html since this controller has been configured
+                //with only json formatters.
+                response.Content = new StringContent(string.Empty, Encoding.UTF8, "text/html");
+
+                return response;
+            }
+
+            //because macro's are filled with insane legacy bits and pieces we need all sorts of wierdness to make them render.
+            //the 'easiest' way might be to create an IPublishedContent manually and populate the legacy 'page' object with that
+            //and then set the legacy parameters.
+
+            var legacyPage = new global::umbraco.page(doc);
             UmbracoContext.HttpContext.Items["pageID"] = doc.Id;
             UmbracoContext.HttpContext.Items["pageElements"] = legacyPage.Elements;
             UmbracoContext.HttpContext.Items[global::Umbraco.Core.Constants.Conventions.Url.AltTemplate] = null;

From de41a1f1ca0a2026a7d9023c45f69f35086692b2 Mon Sep 17 00:00:00 2001
From: Tommy Enger <tommy_enger@hotmail.com>
Date: Mon, 23 Nov 2015 16:29:09 +0100
Subject: [PATCH 40/68] Clean up the code

DRY
---
 src/Umbraco.Web/Editors/MacroController.cs | 51 +++-------------------
 1 file changed, 6 insertions(+), 45 deletions(-)

diff --git a/src/Umbraco.Web/Editors/MacroController.cs b/src/Umbraco.Web/Editors/MacroController.cs
index fed4fe6805..1364679b93 100644
--- a/src/Umbraco.Web/Editors/MacroController.cs
+++ b/src/Umbraco.Web/Editors/MacroController.cs
@@ -52,51 +52,7 @@ namespace Umbraco.Web.Editors
         [HttpGet]
         public HttpResponseMessage GetMacroResultAsHtmlForEditor(string macroAlias, int pageId, [FromUri] IDictionary<string, object> macroParams)
         {
-            // note - here we should be using the cache, provided that the preview content is in the cache...
-
-            var doc = Services.ContentService.GetById(pageId);
-            if (doc == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            //need to get a legacy macro object - eventually we'll have a new format but nto yet
-            var macro = new macro(macroAlias);
-            if (macro == null)
-            {
-                throw new HttpResponseException(HttpStatusCode.NotFound);
-            }
-
-            //if it isn't supposed to be rendered in the editor then return an empty string
-            if (macro.DontRenderInEditor)
-            {
-                var response = Request.CreateResponse();
-                //need to create a specific content result formatted as html since this controller has been configured
-                //with only json formatters.
-                response.Content = new StringContent(string.Empty, Encoding.UTF8, "text/html");
-
-                return response;
-            }
-
-            //because macro's are filled with insane legacy bits and pieces we need all sorts of wierdness to make them render.
-            //the 'easiest' way might be to create an IPublishedContent manually and populate the legacy 'page' object with that
-            //and then set the legacy parameters.
-
-            var legacyPage = new global::umbraco.page(doc);
-            UmbracoContext.HttpContext.Items["pageID"] = doc.Id;
-            UmbracoContext.HttpContext.Items["pageElements"] = legacyPage.Elements;
-            UmbracoContext.HttpContext.Items[global::Umbraco.Core.Constants.Conventions.Url.AltTemplate] = null;
-
-            var renderer = new UmbracoComponentRenderer(UmbracoContext);
-
-            var result = Request.CreateResponse();
-            //need to create a specific content result formatted as html since this controller has been configured
-            //with only json formatters.
-            result.Content = new StringContent(
-                renderer.RenderMacro(macro, macroParams, legacyPage).ToString(),
-                Encoding.UTF8,
-                "text/html");
-            return result;
+            return GetMacroResultAsHtml(macroAlias, pageId, macroParams);
         }
 
         /// <summary>
@@ -110,6 +66,11 @@ namespace Umbraco.Web.Editors
         /// <returns></returns>
         [HttpPost]
         public HttpResponseMessage GetMacroResultAsHtmlForEditorUsingHttpPost(string macroAlias, int pageId, [FromBody]IDictionary<string, object> macroParams)
+        {
+            return GetMacroResultAsHtml(macroAlias, pageId, macroParams);
+        }
+
+        private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId, IDictionary<string, object> macroParams)
         {
             // note - here we should be using the cache, provided that the preview content is in the cache...
 

From f83c966e55f4fe8b5bbf10e2d44d952e846c6ddb Mon Sep 17 00:00:00 2001
From: kiasyn <kiasyn@users.noreply.github.com>
Date: Tue, 24 Nov 2015 10:02:14 +1300
Subject: [PATCH 41/68] Remove unnecessary ToLowerInvariant call from
 PreviewMode

Text was being set lowercase and then injected with the preview badge markup. This meant that things such as script tags were being lowercased, breaking the javascript.
---
 src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
index 0cf248fd48..480f182855 100644
--- a/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
+++ b/src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
@@ -238,7 +238,7 @@ namespace Umbraco.Web.Mvc
             {
                 if (UmbracoContext.Current.IsDebug || UmbracoContext.Current.InPreviewMode)
                 {
-                    var text = value.ToString().ToLowerInvariant();
+                    var text = value.ToString();
                     var pos = text.IndexOf("</body>", StringComparison.InvariantCultureIgnoreCase);
 
                     if (pos > -1)
@@ -294,4 +294,4 @@ namespace Umbraco.Web.Mvc
             return WebViewPageExtensions.RenderSection(this, name, defaultContents);
         }
     }
-}
\ No newline at end of file
+}

From 1353b0a5922e89a9c3dca35e05e4c6c7038aed79 Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Tue, 24 Nov 2015 10:35:54 +0100
Subject: [PATCH 42/68] Reordering flex properties - recess module crashes with
 out of memory exception if they are in the other order.

---
 src/Umbraco.Web.UI.Client/src/less/panel.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
index d02b0d0bce..9fedbfc9eb 100644
--- a/src/Umbraco.Web.UI.Client/src/less/panel.less
+++ b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -49,8 +49,8 @@
     display: flex;
 
     .form-search {
-        -ms-flex: 1;
         -webkit-flex: 1;
+        -ms-flex: 1;
         flex: 1;
     }
 

From 6d0aa824adcd50b4bbc710745036cd5488c99514 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 24 Nov 2015 16:31:18 +0100
Subject: [PATCH 43/68] U4-7307 Windows Authentication prompts for Windows
 login after Umbraco login

---
 .../Security/Identity/AppBuilderExtensions.cs |  4 +-
 .../Identity/FixWindowsAuthMiddlware.cs       | 51 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/Umbraco.Web/Security/Identity/FixWindowsAuthMiddlware.cs

diff --git a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
index 1668b6776d..946810ffc9 100644
--- a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
@@ -171,9 +171,11 @@ namespace Umbraco.Web.Security.Identity
             app.Use(typeof(CookieAuthenticationMiddleware), app, options);
             app.UseStageMarker(PipelineStage.Authenticate);
             
-            //Then our custom middleware
+            //Then our custom middlewares
             app.Use(typeof(ForceRenewalCookieAuthenticationMiddleware), app, options);
             app.UseStageMarker(PipelineStage.Authenticate);
+            app.Use(typeof(FixWindowsAuthMiddlware));
+            app.UseStageMarker(PipelineStage.Authenticate);
 
             return app;
         }
diff --git a/src/Umbraco.Web/Security/Identity/FixWindowsAuthMiddlware.cs b/src/Umbraco.Web/Security/Identity/FixWindowsAuthMiddlware.cs
new file mode 100644
index 0000000000..911a304019
--- /dev/null
+++ b/src/Umbraco.Web/Security/Identity/FixWindowsAuthMiddlware.cs
@@ -0,0 +1,51 @@
+using System.Linq;
+using System.Security.Claims;
+using System.Security.Principal;
+using System.Threading.Tasks;
+using Microsoft.Owin;
+using Umbraco.Core;
+using Umbraco.Core.Security;
+
+namespace Umbraco.Web.Security.Identity
+{
+    /// <summary>
+    /// This is used to inspect the request to see if 2 x identities are assigned: A windows one and a back office one.
+    /// When this is the case, it means that auth has executed for Windows & auth has executed for our back office cookie
+    /// handler and now two identities have been assigned. Unfortunately, at some stage in the pipeline - I'm pretty sure
+    /// it's the Role Provider Module - it again changes the user's Principal to a RolePrincipal and discards the second
+    /// Identity which is the Back office identity thus preventing a user from accessing the back office... it's very annoying.
+    /// 
+    /// To fix this, we re-set the user Principal to only have a single identity: the back office one, since we know this is
+    /// for a back office request.
+    /// </summary>
+    internal class FixWindowsAuthMiddlware : OwinMiddleware
+    {
+        public FixWindowsAuthMiddlware(OwinMiddleware next) : base(next)
+        {
+        }
+
+        public override async Task Invoke(IOwinContext context)
+        {
+            if (context.Request.Uri.IsClientSideRequest() == false)
+            {
+                var claimsPrincipal = context.Request.User as ClaimsPrincipal;
+                if (claimsPrincipal != null
+                    && claimsPrincipal.Identities.Count() > 1
+                    && claimsPrincipal.Identities.Any(x => x is WindowsIdentity)
+                    && claimsPrincipal.Identities.Any(x => x is UmbracoBackOfficeIdentity))
+                {
+                    var backOfficeIdentity = claimsPrincipal.Identities.First(x => x is UmbracoBackOfficeIdentity);
+                    if (backOfficeIdentity.IsAuthenticated)
+                    {
+                        context.Request.User = new ClaimsPrincipal(backOfficeIdentity);
+                    }
+                }
+            }
+
+            if (Next != null)
+            {
+                await Next.Invoke(context);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 6be3318fb4..1edf654af6 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -310,6 +310,7 @@
     <Compile Include="RequestLifespanMessagesFactory.cs" />
     <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
     <Compile Include="Security\Identity\ExternalSignInAutoLinkOptions.cs" />
+    <Compile Include="Security\Identity\FixWindowsAuthMiddlware.cs" />
     <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationHandler.cs" />
     <Compile Include="Security\Identity\ForceRenewalCookieAuthenticationMiddleware.cs" />
     <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />

From 068c4a0b168818eb17ccf04a8cfe3fb876f38fe2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Nov 2015 11:22:12 +0100
Subject: [PATCH 44/68] Fixes PR for U4-7362 Add message to login screen if
 Caps Lock is on

---
 src/Umbraco.Web.UI.Client/bower.json          | 2 +-
 src/Umbraco.Web.UI.Client/gruntFile.js        | 5 ++++-
 src/Umbraco.Web.UI.Client/src/loader.dev.js   | 4 ++--
 src/Umbraco.Web/UI/JavaScript/JsInitialize.js | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 097ea1da66..6d5a5949cd 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -26,6 +26,6 @@
     "angular-dynamic-locale": "~0.1.27",
     "tinymce": "~4.1.10",
     "codemirror": "~5.3.0",
-    "ngCapsLock": "~1.0.2"
+    "ng-caps-lock": "~1.0.2"
   }
 }
diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
index 8699f4a6f1..b184dee673 100644
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -459,7 +459,10 @@ module.exports = function (grunt) {
                         },
                         'angular-dynamic-locale': {
                             files: ['tmhDynamicLocale.min.js', 'tmhDynamicLocale.min.js.map']
-                        },                        
+                        },
+                        'ng-caps-lock': {
+                            files: ['ng-caps-lock.min.js']
+                        },
                         'codemirror': {
                             files: [
                                 'lib/codemirror.js',
diff --git a/src/Umbraco.Web.UI.Client/src/loader.dev.js b/src/Umbraco.Web.UI.Client/src/loader.dev.js
index 87319d751f..ff0fe23ecc 100644
--- a/src/Umbraco.Web.UI.Client/src/loader.dev.js
+++ b/src/Umbraco.Web.UI.Client/src/loader.dev.js
@@ -10,9 +10,9 @@ LazyLoad.js(
         'lib/angular/1.1.5/angular-mobile.js',
         'lib/angular/1.1.5/angular-sanitize.min.js',
 
-        'lib/angular/ng-caps-lock.js',
+        'lib/ng-caps-lock/ng-caps-lock.min.js',
 
-        'lib/ngCapsLock/angular-ui-sortable.js',
+        'lib/angular/angular-ui-sortable.js',
 
         'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',
 
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
index cec31154d8..b0edc302ab 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -9,6 +9,8 @@
     'lib/angular/1.1.5/angular-mobile.js',
     'lib/angular/1.1.5/angular-sanitize.min.js',
 
+    'lib/ng-caps-lock/ng-caps-lock.min.js',
+
     'lib/angular/angular-ui-sortable.js',
 
     'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',

From 924a016ffe7ae7ea6d516c07a7852f0095eddbce Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Nov 2015 18:05:57 +0100
Subject: [PATCH 45/68] Fixes U4-7457 Server side request forgery (xsrf) in
 feedproxy.aspx

---
 .../umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
index a938935d2b..b304cda0b6 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
@@ -27,7 +27,9 @@ namespace dashboardUtilities
                         if (Uri.TryCreate(url, UriKind.Absolute, out requestUri))
                         {
                             var feedProxyXml = xmlHelper.OpenAsXmlDocument(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
-                            if (feedProxyXml != null && feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null)
+                            if (feedProxyXml != null 
+                                && feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null
+                                && requestUri.Port == 80)
                             {
                                 using (var client = new WebClient())
                                 {

From 18c3345e47663a358a042652e697b988d6a380eb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Nov 2015 19:39:24 +0100
Subject: [PATCH 46/68] Fixes U4-7459 XSRF protection bypass  - ensures tokens
 are checked for the non-editor api controllers

---
 .../umbraco_client/Application/Extensions.js  | 16 +++++
 ...dateMvcAngularAntiForgeryTokenAttribute.cs | 61 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 .../Filters/AngularAntiForgeryHelper.cs       | 45 +++++++++-----
 .../WebServices/BulkPublishController.cs      |  1 +
 .../WebServices/DomainsApiController.cs       |  2 +
 .../ExamineManagementApiController.cs         |  2 +
 .../WebServices/SaveFileController.cs         |  1 +
 .../WebServices/XmlDataIntegrityController.cs |  3 +-
 9 files changed, 116 insertions(+), 16 deletions(-)
 create mode 100644 src/Umbraco.Web/Mvc/ValidateMvcAngularAntiForgeryTokenAttribute.cs

diff --git a/src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js b/src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
index 66c97c4db7..63870fad08 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Application/Extensions.js
@@ -357,4 +357,20 @@
 
     });
 
+    //This sets the default jquery ajax headers to include our csrf token, we
+    // need to user the beforeSend method because our token changes per user/login so
+    // it cannot be static
+    $.ajaxSetup({
+        beforeSend: function (xhr) {
+
+            function getCookie(name) {
+                var value = "; " + document.cookie;
+                var parts = value.split("; " + name + "=");
+                if (parts.length === 2) return parts.pop().split(";").shift();
+            }
+
+            xhr.setRequestHeader("X-XSRF-TOKEN", getCookie("XSRF-TOKEN"));
+        }
+    });
+
 })(jQuery);
\ No newline at end of file
diff --git a/src/Umbraco.Web/Mvc/ValidateMvcAngularAntiForgeryTokenAttribute.cs b/src/Umbraco.Web/Mvc/ValidateMvcAngularAntiForgeryTokenAttribute.cs
new file mode 100644
index 0000000000..977f37473b
--- /dev/null
+++ b/src/Umbraco.Web/Mvc/ValidateMvcAngularAntiForgeryTokenAttribute.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Security.Claims;
+using System.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
+
+namespace Umbraco.Web.Mvc
+{
+    /// <summary>
+    /// A filter to check for the csrf token based on Angular's standard approach
+    /// </summary>
+    /// <remarks>
+    /// Code derived from http://ericpanorel.net/2013/07/28/spa-authentication-and-csrf-mvc4-antiforgery-implementation/
+    /// 
+    /// If the authentication type is cookie based, then this filter will execute, otherwise it will be disabled
+    /// </remarks>
+    public sealed class ValidateMvcAngularAntiForgeryTokenAttribute : ActionFilterAttribute
+    {
+        public override void OnActionExecuting(ActionExecutingContext filterContext)
+        {
+            var userIdentity = filterContext.HttpContext.User.Identity as ClaimsIdentity;
+            if (userIdentity != null)
+            {
+                //if there is not CookiePath claim, then exist
+                if (userIdentity.HasClaim(x => x.Type == ClaimTypes.CookiePath) == false)
+                {
+                    base.OnActionExecuting(filterContext);
+                    return;
+                }
+            }
+
+            string failedReason;
+            var headers = new List<KeyValuePair<string, List<string>>>();
+            foreach (var key in filterContext.HttpContext.Request.Headers.AllKeys)
+            {
+                if (headers.Any(x => x.Key == key))
+                {
+                    var found = headers.First(x => x.Key == key);
+                    found.Value.Add(filterContext.HttpContext.Request.Headers[key]);
+                }
+                else
+                {
+                    headers.Add(new KeyValuePair<string, List<string>>(key, new List<string> { filterContext.HttpContext.Request.Headers[key] }));
+                }
+            }
+            var cookie = filterContext.HttpContext.Request.Cookies[AngularAntiForgeryHelper.CsrfValidationCookieName];
+            if (AngularAntiForgeryHelper.ValidateHeaders(
+                headers.Select(x => new KeyValuePair<string, IEnumerable<string>>(x.Key, x.Value)).ToArray(),
+                cookie == null ? "" : cookie.Value,
+                out failedReason) == false)
+            {
+                var result = new HttpStatusCodeResult(HttpStatusCode.ExpectationFailed);
+                filterContext.Result = result;
+                return;
+            }
+
+            base.OnActionExecuting(filterContext);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 1edf654af6..f84a2872ac 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -306,6 +306,7 @@
     <Compile Include="Models\PublishedContentWithKeyBase.cs" />
     <Compile Include="Mvc\IRenderController.cs" />
     <Compile Include="Mvc\RenderIndexActionSelectorAttribute.cs" />
+    <Compile Include="Mvc\ValidateMvcAngularAntiForgeryTokenAttribute.cs" />
     <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
     <Compile Include="RequestLifespanMessagesFactory.cs" />
     <Compile Include="Scheduling\LatchedBackgroundTaskBase.cs" />
diff --git a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
index d48cd66077..962183f7ef 100644
--- a/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
+++ b/src/Umbraco.Web/WebApi/Filters/AngularAntiForgeryHelper.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -28,6 +30,8 @@ namespace Umbraco.Web.WebApi.Filters
         /// </summary>
         public const string AngularHeadername = "X-XSRF-TOKEN";
 
+        
+
         /// <summary>
         /// Returns 2 tokens - one for the cookie value and one that angular should set as the header value
         /// </summary>
@@ -64,13 +68,10 @@ namespace Umbraco.Web.WebApi.Filters
             return true;
         }
 
-        /// <summary>
-        /// Validates the headers/cookies passed in for the request
-        /// </summary>
-        /// <param name="requestHeaders"></param>
-        /// <param name="failedReason"></param>
-        /// <returns></returns>
-        public static bool ValidateHeaders(HttpRequestHeaders requestHeaders, out string failedReason)
+        internal static bool ValidateHeaders(            
+            KeyValuePair<string, IEnumerable<string>>[] requestHeaders, 
+            string cookieToken,
+            out string failedReason)
         {
             failedReason = "";
 
@@ -85,12 +86,7 @@ namespace Umbraco.Web.WebApi.Filters
                 .Select(z => z.Value)
                 .SelectMany(z => z)
                 .FirstOrDefault();
-
-            var cookieToken = requestHeaders
-                .GetCookies()
-                .Select(c => c[CsrfValidationCookieName])
-                .FirstOrDefault();
-
+            
             // both header and cookie must be there
             if (cookieToken == null || headerToken == null)
             {
@@ -98,13 +94,32 @@ namespace Umbraco.Web.WebApi.Filters
                 return false;
             }
 
-            if (ValidateTokens(cookieToken.Value, headerToken) == false)
+            if (ValidateTokens(cookieToken, headerToken) == false)
             {
                 failedReason = "Invalid token";
                 return false;
             }
-            
+
             return true;
         }
+
+        /// <summary>
+        /// Validates the headers/cookies passed in for the request
+        /// </summary>
+        /// <param name="requestHeaders"></param>
+        /// <param name="failedReason"></param>
+        /// <returns></returns>
+        public static bool ValidateHeaders(HttpRequestHeaders requestHeaders, out string failedReason)
+        {
+            var cookieToken = requestHeaders
+                .GetCookies()
+                .Select(c => c[CsrfValidationCookieName])
+                .FirstOrDefault();
+
+            return ValidateHeaders(
+                requestHeaders.ToDictionary(x => x.Key, x => x.Value).ToArray(),
+                cookieToken == null ? null : cookieToken.Value,
+                out failedReason);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/WebServices/BulkPublishController.cs b/src/Umbraco.Web/WebServices/BulkPublishController.cs
index 30a609f6ff..cc9a153e07 100644
--- a/src/Umbraco.Web/WebServices/BulkPublishController.cs
+++ b/src/Umbraco.Web/WebServices/BulkPublishController.cs
@@ -15,6 +15,7 @@ namespace Umbraco.Web.WebServices
     /// <summary>
     /// A REST controller used for the publish dialog in order to publish bulk items at once
     /// </summary>
+    [ValidateMvcAngularAntiForgeryToken]
     public class BulkPublishController : UmbracoAuthorizedController
     {
         /// <summary>
diff --git a/src/Umbraco.Web/WebServices/DomainsApiController.cs b/src/Umbraco.Web/WebServices/DomainsApiController.cs
index 4f3509845d..8c146f2670 100644
--- a/src/Umbraco.Web/WebServices/DomainsApiController.cs
+++ b/src/Umbraco.Web/WebServices/DomainsApiController.cs
@@ -13,6 +13,7 @@ using Umbraco.Web.WebApi;
 //using umbraco.cms.businesslogic.language;
 using umbraco.BusinessLogic.Actions;
 using umbraco.cms.businesslogic.web;
+using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.WebServices
 {
@@ -20,6 +21,7 @@ namespace Umbraco.Web.WebServices
     /// A REST controller used for managing domains.
     /// </summary>
     /// <remarks>Nothing to do with Active Directory.</remarks>
+    [ValidateAngularAntiForgeryToken]
     public class DomainsApiController : UmbracoAuthorizedApiController
     {
         [HttpPost]
diff --git a/src/Umbraco.Web/WebServices/ExamineManagementApiController.cs b/src/Umbraco.Web/WebServices/ExamineManagementApiController.cs
index 01e9f30254..31ef4d23f2 100644
--- a/src/Umbraco.Web/WebServices/ExamineManagementApiController.cs
+++ b/src/Umbraco.Web/WebServices/ExamineManagementApiController.cs
@@ -13,9 +13,11 @@ using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Web.Search;
 using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.WebServices
 {
+    [ValidateAngularAntiForgeryToken]
     public class ExamineManagementApiController : UmbracoAuthorizedApiController
     {
         /// <summary>
diff --git a/src/Umbraco.Web/WebServices/SaveFileController.cs b/src/Umbraco.Web/WebServices/SaveFileController.cs
index f18f690b87..fb2c90a8c3 100644
--- a/src/Umbraco.Web/WebServices/SaveFileController.cs
+++ b/src/Umbraco.Web/WebServices/SaveFileController.cs
@@ -26,6 +26,7 @@ namespace Umbraco.Web.WebServices
     /// This isn't fully implemented yet but we should migrate all of the logic in the umbraco.presentation.webservices.codeEditorSave
     /// over to this controller.
     /// </remarks>
+    [ValidateMvcAngularAntiForgeryToken]
     public class SaveFileController : UmbracoAuthorizedController
     {
         /// <summary>
diff --git a/src/Umbraco.Web/WebServices/XmlDataIntegrityController.cs b/src/Umbraco.Web/WebServices/XmlDataIntegrityController.cs
index 6c1859dbfa..66951d12f2 100644
--- a/src/Umbraco.Web/WebServices/XmlDataIntegrityController.cs
+++ b/src/Umbraco.Web/WebServices/XmlDataIntegrityController.cs
@@ -4,10 +4,11 @@ using Umbraco.Core;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
 
 namespace Umbraco.Web.WebServices
 {
-
+    [ValidateAngularAntiForgeryToken]
     public class XmlDataIntegrityController : UmbracoAuthorizedApiController
     {
         [HttpPost]

From c97617f5b5c0050db8f465f19f17a9e299cb973b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Nov 2015 20:15:28 +0100
Subject: [PATCH 47/68] Fixes: U4-7461 xss vulnerability in content type editor

---
 .../Editors/DataTypeValidateAttribute.cs      |  3 ++
 .../WebServices/SaveFileController.cs         |  4 +--
 .../controls/ContentTypeControlNew.ascx.cs    | 32 -------------------
 .../umbraco/settings/EditNodeTypeNew.aspx.cs  |  5 +--
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
index 6757082a49..b0ff5d9263 100644
--- a/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
+++ b/src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
@@ -42,6 +42,9 @@ namespace Umbraco.Web.Editors
         {
             var dataType = (DataTypeSave)actionContext.ActionArguments["dataType"];
 
+            dataType.Name = dataType.Name.CleanForXss();
+            dataType.Alias = dataType.Name.CleanForXss();
+
             //Validate that the property editor exists
             var propertyEditor = PropertyEditorResolver.Current.GetByAlias(dataType.SelectedEditor);
             if (propertyEditor == null)
diff --git a/src/Umbraco.Web/WebServices/SaveFileController.cs b/src/Umbraco.Web/WebServices/SaveFileController.cs
index fb2c90a8c3..5da935da64 100644
--- a/src/Umbraco.Web/WebServices/SaveFileController.cs
+++ b/src/Umbraco.Web/WebServices/SaveFileController.cs
@@ -152,8 +152,8 @@ namespace Umbraco.Web.WebServices
             {
                 t = new Template(templateId)
                 {
-                    Text = templateName,
-                    Alias = templateAlias,
+                    Text = templateName.CleanForXss(),
+                    Alias = templateAlias.CleanForXss(),
                     Design = templateContents
                 };
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
index 44b4da1864..d5f7f12a2f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -585,28 +585,6 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
             */
         }
 
-        private void AddSpriteListItem(string iconClass, ICollection<ListItem> listOfIcons)
-        {
-            var li = new ListItem(
-                      helper.SpaceCamelCasing((iconClass.Substring(1, iconClass.Length - 1)))
-                      .Replace("Spr Tree", "")
-                      .Trim(), iconClass);
-
-            li.Attributes.Add("class", "spriteBackground sprTree " + iconClass.Trim('.'));
-            li.Attributes.Add("style", "padding-left:24px !important; background-repeat:no-repeat; width:auto; height:auto;");
-
-            AddListItem(listOfIcons, li);
-        }
-
-        private void AddFileListItem(string fileName, string listItemValue, ICollection<ListItem> listOfIcons)
-        {
-            var li = new ListItem(fileName, fileName);
-
-            li.Attributes.Add("title", listItemValue);
-
-            AddListItem(listOfIcons, li);
-        }
-
         private void AddListItem(ICollection<ListItem> listOfIcons, ListItem li)
         {
             if (this.Page.IsPostBack == false && li.Value == _contentType.IconUrl)
@@ -615,16 +593,6 @@ jQuery(document).ready(function() {{ refreshDropDowns(); }});
             listOfIcons.Add(li);
         }
 
-        private static string IconClassToIconFileName(string iconClass)
-        {
-            return iconClass.Substring(1, iconClass.Length - 1).ToLowerInvariant().Replace("sprTree".ToLowerInvariant(), "");
-        }
-
-        private static string FileNameToIconFileName(FileInfo file)
-        {
-            return file.Name.Substring(0, file.Name.LastIndexOf(".", StringComparison.Ordinal)).ToLowerInvariant();
-        }        
-
         #endregion
 
         #region "Structure" Pane
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
index 3773f137c6..6e3756d2a0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
@@ -7,6 +7,7 @@ using umbraco.cms.presentation.Trees;
 using umbraco.cms.businesslogic.web;
 using System.Linq;
 using umbraco.controls;
+using Umbraco.Core;
 
 namespace umbraco.settings
 {
@@ -117,7 +118,7 @@ namespace umbraco.settings
             templateList.Items.Clear();
             templateList.Items.AddRange(templates.ConvertAll(item =>
             {
-                var li = new ListItem { Text = item.Name, Value = item.Id.ToString(CultureInfo.InvariantCulture), Selected = item.Selected };
+                var li = new ListItem { Text = item.Name.CleanForXss(), Value = item.Id.ToString(CultureInfo.InvariantCulture), Selected = item.Selected };
                 return li;
             }).ToArray());
 
@@ -127,7 +128,7 @@ namespace umbraco.settings
             ddlTemplates.Items.Insert(0, new ListItem(ui.Text("choose") + "...", "0"));
             ddlTemplates.Items.AddRange(templates.ConvertAll(item =>
             {
-                var li = new ListItem { Text = item.Name, Value = item.Id.ToString(CultureInfo.InvariantCulture) };
+                var li = new ListItem { Text = item.Name.CleanForXss(), Value = item.Id.ToString(CultureInfo.InvariantCulture) };
                 return li;
             }).ToArray());
 

From b7795e19efb32f432c1f5a608df4a7134ab6cc4e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Nov 2015 20:21:24 +0100
Subject: [PATCH 48/68] Changes bigthumbnail pr to not cache per second, just
 minute

---
 .../views/propertyeditors/fileupload/fileupload.controller.js   | 2 +-
 src/Umbraco.Web/Editors/ImagesController.cs                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index d62d76c982..05ca39ea16 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -154,7 +154,7 @@ angular.module("umbraco")
                         if (thumbnail) {
                             if (mediaHelper.detectIfImageByExtension(property.value)) {
                                 //get default big thumbnail from image processor
-                                var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500";
+                                var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmm") + "&width=500";
                                 return thumbnailUrl;
                             }
                             else {
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index 14444f53ee..cbbbb30c36 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -113,7 +113,7 @@ namespace Umbraco.Web.Editors
 
             var imagePath = imageProp.Value.ToString();
             var response = Request.CreateResponse( HttpStatusCode.Found );
-            response.Headers.Location = new Uri( string.Format( "{0}?rnd={1}&width={2}", imagePath, string.Format( "{0:yyyyMMddHHmmss}", media.UpdateDate ), width ), UriKind.Relative );
+            response.Headers.Location = new Uri( string.Format( "{0}?rnd={1}&width={2}", imagePath, string.Format( "{0:yyyyMMddHHmm}", media.UpdateDate ), width ), UriKind.Relative );
             return response;
         }
     }

From c8482b9f591b9397e87e8982e19544c4c62aa208 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Nov 2015 20:27:58 +0100
Subject: [PATCH 49/68] Revert "Merge pull request #875 from Phosworks/U4-7312"

This reverts commit 14265fc9644c844935814672b447cdce810e3a4e, reversing
changes made to 18c3345e47663a358a042652e697b988d6a380eb.

Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
	src/Umbraco.Web/Editors/ImagesController.cs
---
 .../fileupload/fileupload.controller.js       |  47 +--
 src/Umbraco.Web/Editors/ImagesController.cs   | 291 +++++++++++-------
 2 files changed, 198 insertions(+), 140 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index 05ca39ea16..37dea64c21 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -144,28 +144,31 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag
 };
 angular.module("umbraco")
     .controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
-    .run(function(mediaHelper, umbRequestHelper, assetsService){
+    .run(function(mediaHelper, umbRequestHelper){
         if (mediaHelper && mediaHelper.registerFileResolver) {
-            assetsService.load(["lib/moment/moment-with-locales.js"]).then(
-                function () {
-                    //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
-                    // they contain different data structures so if we need to query against it we need to be aware of this.
-                    mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
-                        if (thumbnail) {
-                            if (mediaHelper.detectIfImageByExtension(property.value)) {
-                                //get default big thumbnail from image processor
-                                var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmm") + "&width=500";
-                                return thumbnailUrl;
-                            }
-                            else {
-                                return null;
-                            }
-                        }
-                        else {
-                            return property.value;
-                        }
-                    });
+
+            //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
+            // they contain different data structures so if we need to query against it we need to be aware of this.
+            mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
+                if (thumbnail) {
+
+                    if (mediaHelper.detectIfImageByExtension(property.value)) {
+
+                        var thumbnailUrl = umbRequestHelper.getApiUrl(
+                            "imagesApiBaseUrl",
+                            "GetBigThumbnail",
+                            [{ originalImagePath: property.value }]);
+                            
+                        return thumbnailUrl;
+                    }
+                    else {
+                        return null;
+                    }
+                    
                 }
-            );
+                else {
+                    return property.value;
+                }
+            });
         }
-    });
+    });
\ No newline at end of file
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index cbbbb30c36..39960317b1 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -1,120 +1,175 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Media;
-using Umbraco.Core.Models;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Filters;
-using Constants = Umbraco.Core.Constants;
-
-namespace Umbraco.Web.Editors
-{
-    /// <summary>
-    /// A controller used to return images for media
-    /// </summary>
-    [PluginController("UmbracoApi")]
-    public class ImagesController : UmbracoAuthorizedApiController
-    {
-        /// <summary>
-        /// Gets the big thumbnail image for the media id
-        /// </summary>
-        /// <param name="mediaId"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// If there is no media, image property or image file is found then this will return not found.
-        /// </remarks>
-        public HttpResponseMessage GetBigThumbnail(int mediaId)
-        {
-            var media = Services.MediaService.GetById(mediaId);
-            if (media == null)
-            {
-                return Request.CreateResponse(HttpStatusCode.NotFound);
-            }
-
-            return GetResized(media, 500);
-        }
-
-        /// <summary>
-        /// Gets the big thumbnail image for the original image path
-        /// </summary>
-        /// <param name="originalImagePath"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// If there is no original image is found then this will return not found.
-        /// </remarks>
-        public HttpResponseMessage GetBigThumbnail(string originalImagePath)
-        {
-            if (string.IsNullOrWhiteSpace(originalImagePath))
-                return Request.CreateResponse(HttpStatusCode.OK);
-
-            return GetResized(originalImagePath, 500);
-        }
-
-        /// <summary>
-        /// Gets a resized image for the media id
-        /// </summary>
-        /// <param name="mediaId"></param>
-        /// <param name="width"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// If there is no media, image property or image file is found then this will return not found.
-        /// </remarks>
-        public HttpResponseMessage GetResized(int mediaId, int width)
-        {
-            var media = Services.MediaService.GetById(mediaId);
-            if (media == null)
-            {
-                return new HttpResponseMessage(HttpStatusCode.NotFound);
-            }
-
-            return GetResized( media, 500 );
-        }
-
-        /// <summary>
-        /// Gets a resized image for the image at the given path
-        /// </summary>
-        /// <param name="imagePath"></param>
-        /// <param name="width"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// If there is no media, image property or image file is found then this will return not found.
-        /// </remarks>
-        public HttpResponseMessage GetResized(string imagePath, int width)
-        {
-            var media = Services.MediaService.GetMediaByPath( imagePath );
-            if (media == null)
-            {
-                return new HttpResponseMessage( HttpStatusCode.NotFound );
-            }
-
-            return GetResized( media, 500 );
-        }
-
-        /// <summary>
-        /// Gets a resized image by redirecting to ImageProcessor
-        /// </summary>
-        /// <param name="media"></param>
-        /// <param name="width"></param>
-        /// <returns></returns>
-        private HttpResponseMessage GetResized(IMedia media, int width)
+using System;
+using System.Drawing;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Media;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
+using Constants = Umbraco.Core.Constants;
+
+namespace Umbraco.Web.Editors
+{
+    /// <summary>
+    /// A controller used to return images for media
+    /// </summary>
+    [PluginController("UmbracoApi")]
+    public class ImagesController : UmbracoAuthorizedApiController
+    {
+        /// <summary>
+        /// Gets the big thumbnail image for the media id
+        /// </summary>
+        /// <param name="mediaId"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// If there is no media, image property or image file is found then this will return not found.
+        /// </remarks>
+        public HttpResponseMessage GetBigThumbnail(int mediaId)
         {
-            var imageProp = media.Properties[Constants.Conventions.Media.File];
-            if (imageProp == null)
-            {
-                return Request.CreateResponse( HttpStatusCode.NotFound );
-            }
-
-            var imagePath = imageProp.Value.ToString();
-            var response = Request.CreateResponse( HttpStatusCode.Found );
-            response.Headers.Location = new Uri( string.Format( "{0}?rnd={1}&width={2}", imagePath, string.Format( "{0:yyyyMMddHHmm}", media.UpdateDate ), width ), UriKind.Relative );
-            return response;
-        }
-    }
+            var media = Services.MediaService.GetById(mediaId);
+            if (media == null)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+            var imageProp = media.Properties[Constants.Conventions.Media.File];
+            if (imageProp == null)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            var imagePath = imageProp.Value.ToString();
+
+            return GetBigThumbnail(imagePath);
+        }
+
+        /// <summary>
+        /// Gets the big thumbnail image for the original image path
+        /// </summary>
+        /// <param name="originalImagePath"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// If there is no original image is found then this will return not found.
+        /// </remarks>
+        public HttpResponseMessage GetBigThumbnail(string originalImagePath)
+        {
+            if (string.IsNullOrWhiteSpace(originalImagePath))
+                return Request.CreateResponse(HttpStatusCode.OK);
+
+            return GetResized(originalImagePath, 500, "big-thumb");
+        }
+
+        /// <summary>
+        /// Gets a resized image for the media id
+        /// </summary>
+        /// <param name="mediaId"></param>
+        /// <param name="width"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// If there is no media, image property or image file is found then this will return not found.
+        /// </remarks>
+        public HttpResponseMessage GetResized(int mediaId, int width)
+        {
+            var media = Services.MediaService.GetById(mediaId);
+            if (media == null)
+            {
+                return new HttpResponseMessage(HttpStatusCode.NotFound);
+            }
+            var imageProp = media.Properties[Constants.Conventions.Media.File];
+            if (imageProp == null)
+            {
+                return new HttpResponseMessage(HttpStatusCode.NotFound);
+            }
+
+            var imagePath = imageProp.Value.ToString();
+
+            return GetResized(imagePath, width);
+        }
+
+        /// <summary>
+        /// Gets a resized image for the image at the given path
+        /// </summary>
+        /// <param name="imagePath"></param>
+        /// <param name="width"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// If there is no media, image property or image file is found then this will return not found.
+        /// </remarks>
+        public HttpResponseMessage GetResized(string imagePath, int width)
+        {
+            return GetResized(imagePath, width, Convert.ToString(width));
+        }
+
+        //TODO: We should delegate this to ImageProcessing
+
+        /// <summary>
+        /// Gets a resized image - if the requested max width is greater than the original image, only the original image will be returned.
+        /// </summary>
+        /// <param name="imagePath"></param>
+        /// <param name="width"></param>
+        /// <param name="suffix"></param>
+        /// <returns></returns>
+        private HttpResponseMessage GetResized(string imagePath, int width, string suffix)
+        {
+            var mediaFileSystem = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
+            var ext = Path.GetExtension(imagePath);
+
+            //we need to check if it is an image by extension
+            if (UmbracoConfig.For.UmbracoSettings().Content.ImageFileTypes.InvariantContains(ext.TrimStart('.')) == false)
+            {
+                return Request.CreateResponse(HttpStatusCode.NotFound);
+            }
+
+            var thumbFilePath = imagePath.TrimEnd(ext) + "_" + suffix + ".jpg";
+            var fullOrgPath = mediaFileSystem.GetFullPath(mediaFileSystem.GetRelativePath(imagePath));
+            var fullNewPath = mediaFileSystem.GetFullPath(mediaFileSystem.GetRelativePath(thumbFilePath));
+            var thumbIsNew = mediaFileSystem.FileExists(fullNewPath) == false;
+            if (thumbIsNew)
+            {
+                //we need to generate it
+                if (mediaFileSystem.FileExists(fullOrgPath) == false)
+                {
+                    return Request.CreateResponse(HttpStatusCode.NotFound);
+                }
+
+                using (var fileStream = mediaFileSystem.OpenFile(fullOrgPath))
+                {
+                    if (fileStream.CanSeek) fileStream.Seek(0, 0);
+                    using (var originalImage = Image.FromStream(fileStream))
+                    {
+                        //If it is bigger, then do the resize
+                        if (originalImage.Width >= width && originalImage.Height >= width)
+                        {
+                            ImageHelper.GenerateThumbnail(
+                                originalImage,
+                                width,
+                                fullNewPath,
+                                "jpg",
+                                mediaFileSystem);
+                        }
+                        else
+                        {
+                            //just return the original image
+                            fullNewPath = fullOrgPath;
+                        }
+                        
+                    }
+                }
+            }
+
+            var result = Request.CreateResponse(HttpStatusCode.OK);
+            //NOTE: That we are not closing this stream as the framework will do that for us, if we try it will
+            // fail. See http://stackoverflow.com/questions/9541351/returning-binary-file-from-controller-in-asp-net-web-api
+            var stream = mediaFileSystem.OpenFile(fullNewPath);
+            if (stream.CanSeek) stream.Seek(0, 0);
+            result.Content = new StreamContent(stream);
+            result.Headers.Date = mediaFileSystem.GetLastModified(imagePath);
+            result.Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
+            return result;
+        }
+    }
 }
\ No newline at end of file

From d300146cf6dd640aff489c31f373134d77782d15 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 25 Nov 2015 20:44:53 +0100
Subject: [PATCH 50/68] trips content/media names, makes sure that the content
 type editor when rendering template names html encodes the names.

---
 src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs     | 6 ++++--
 .../umbraco/settings/EditNodeTypeNew.aspx.cs                | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs b/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs
index b5510ec85d..dda19f9ff9 100644
--- a/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs
+++ b/src/Umbraco.Web/WebApi/Binders/ContentItemBaseBinder.cs
@@ -162,7 +162,7 @@ namespace Umbraco.Web.WebApi.Binders
                 //finally, let's lookup the real content item and create the DTO item
                 model.PersistedContent = GetExisting(model);                
             }
-
+            
             //create the dto from the persisted model
             if (model.PersistedContent != null)
             {
@@ -173,7 +173,9 @@ namespace Umbraco.Web.WebApi.Binders
                 //now map all of the saved values to the dto
                 MapPropertyValuesFromSaved(model, model.ContentDto);    
             }
-            
+
+            model.Name = model.Name.Trim();
+
             return model;
         }
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
index 6e3756d2a0..493bce0d48 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx.cs
@@ -118,7 +118,7 @@ namespace umbraco.settings
             templateList.Items.Clear();
             templateList.Items.AddRange(templates.ConvertAll(item =>
             {
-                var li = new ListItem { Text = item.Name.CleanForXss(), Value = item.Id.ToString(CultureInfo.InvariantCulture), Selected = item.Selected };
+                var li = new ListItem { Text = Server.HtmlEncode(item.Name), Value = item.Id.ToString(CultureInfo.InvariantCulture), Selected = item.Selected };
                 return li;
             }).ToArray());
 
@@ -128,7 +128,7 @@ namespace umbraco.settings
             ddlTemplates.Items.Insert(0, new ListItem(ui.Text("choose") + "...", "0"));
             ddlTemplates.Items.AddRange(templates.ConvertAll(item =>
             {
-                var li = new ListItem { Text = item.Name.CleanForXss(), Value = item.Id.ToString(CultureInfo.InvariantCulture) };
+                var li = new ListItem { Text = Server.HtmlEncode(item.Name), Value = item.Id.ToString(CultureInfo.InvariantCulture) };
                 return li;
             }).ToArray());
 

From fc84821e8b590f6f200021ad1274b77cfd143644 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Nov 2015 10:32:43 +0100
Subject: [PATCH 51/68] fixes U4-6340 Partial view macro with parameters not
 working in RTE - to use a Model to post with the same Action name

---
 .../src/common/resources/macro.resource.js      | 17 +++++++++--------
 src/Umbraco.Web/Editors/MacroController.cs      | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
index c8dc62fc6c..06b5f9496c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js
@@ -45,15 +45,16 @@ function macroResource($q, $http, umbRequestHelper) {
          */
         getMacroResultAsHtmlForEditor: function (macroAlias, pageId, macroParamDictionary) {
 
-            var query = "macroAlias=" + macroAlias + "&pageId=" + pageId;
-
             return umbRequestHelper.resourcePromise(
-               $http.post(
-                   umbRequestHelper.getApiUrl(
-                       "macroApiBaseUrl",
-                       "GetMacroResultAsHtmlForEditorUsingHttpPost",
-                       query), JSON.stringify(macroParamDictionary)),
-               'Failed to retrieve macro result for macro with alias  ' + macroAlias);
+                $http.post(
+                    umbRequestHelper.getApiUrl(
+                        "macroApiBaseUrl",
+                        "GetMacroResultAsHtmlForEditor"), {
+                        macroAlias: macroAlias,
+                        pageId: pageId,
+                        macroParams: macroParamDictionary
+                    }),
+                'Failed to retrieve macro result for macro with alias  ' + macroAlias);
         }
     };
 }
diff --git a/src/Umbraco.Web/Editors/MacroController.cs b/src/Umbraco.Web/Editors/MacroController.cs
index 1364679b93..88af605f61 100644
--- a/src/Umbraco.Web/Editors/MacroController.cs
+++ b/src/Umbraco.Web/Editors/MacroController.cs
@@ -60,14 +60,19 @@ namespace Umbraco.Web.Editors
         /// Using HTTP POST instead of GET allows for more parameters to be passed as it's not dependant on URL-length limitations like GET.
         /// The method using GET is kept to maintain backwards compatibility
         /// </summary>
-        /// <param name="macroAlias"></param>
-        /// <param name="pageId"></param>
-        /// <param name="macroParams"></param>
+        /// <param name="model"></param>
         /// <returns></returns>
         [HttpPost]
-        public HttpResponseMessage GetMacroResultAsHtmlForEditorUsingHttpPost(string macroAlias, int pageId, [FromBody]IDictionary<string, object> macroParams)
+        public HttpResponseMessage GetMacroResultAsHtmlForEditor(MacroParameterModel model)
         {
-            return GetMacroResultAsHtml(macroAlias, pageId, macroParams);
+            return GetMacroResultAsHtml(model.MacroAlias, model.PageId, model.MacroParams);
+        }
+
+        public class MacroParameterModel
+        {
+            public string MacroAlias { get; set; }
+            public int PageId { get; set; }
+            public IDictionary<string, object> MacroParams { get; set; }
         }
 
         private HttpResponseMessage GetMacroResultAsHtml(string macroAlias, int pageId, IDictionary<string, object> macroParams)

From ba4f0cc6a4e915330a1a4552d591de3a385cec53 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Nov 2015 10:35:28 +0100
Subject: [PATCH 52/68] remove file that shouldn't be checked in

---
 .../Umbraco/js/install.loader.js              | 24 -------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/js/install.loader.js

diff --git a/src/Umbraco.Web.UI/Umbraco/js/install.loader.js b/src/Umbraco.Web.UI/Umbraco/js/install.loader.js
deleted file mode 100644
index f61c9d2878..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/js/install.loader.js
+++ /dev/null
@@ -1,24 +0,0 @@
-try {
-    LazyLoad.js([
-      'lib/jquery/jquery.min.js',
-      /* 1.1.5 */
-      'lib/angular/1.1.5/angular.min.js',
-      'lib/angular/1.1.5/angular-cookies.min.js',
-      'lib/angular/1.1.5/angular-mobile.min.js',
-      'lib/angular/1.1.5/angular-mocks.js',
-      'lib/angular/1.1.5/angular-sanitize.min.js',
-      'lib/underscore/underscore-min.js',
-      'js/umbraco.installer.js',
-      'js/umbraco.directives.js'
-    ], function () {
-        jQuery(document).ready(function () {
-            angular.bootstrap(document, ['ngSanitize', 'umbraco.install', 'umbraco.directives.validation']);
-        });
-    });
-}
-catch (err) {
-    if (err.message == 'LazyLoad is not defined') {
-        document.getElementById("feedback").style.display = "none";
-        document.getElementById("missinglazyload").style.display = "block";
-    }
-}
\ No newline at end of file

From 1f4ba9cfdce35abadfb8728348fe749cde6ab24e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Nov 2015 10:36:15 +0100
Subject: [PATCH 53/68] ignores file that shouldn't be there

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 04e39e37c9..32e7c297db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,4 @@ src/*.boltdata/
 src/umbraco.sln.ide/*
 build/UmbracoCms.*/
 src/.vs/
+src/Umbraco.Web.UI/umbraco/js/install.loader.js

From 9782e3711eb7d05912c95957af5909e471a060e6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Nov 2015 10:54:43 +0100
Subject: [PATCH 54/68] Revert "Update bower.json with ngCapsLock"

This reverts commit f0e1460550fd78bbbc7730a9c2277b3d3acdbc94.

Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
---
 src/Umbraco.Web.UI.Client/bower.json                        | 3 +--
 src/Umbraco.Web.UI.Client/src/app.dev.js                    | 1 -
 src/Umbraco.Web.UI.Client/src/app.js                        | 1 -
 src/Umbraco.Web.UI.Client/src/loader.dev.js                 | 2 --
 .../src/views/common/dialogs/login.html                     | 1 -
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml               | 6 +++++-
 src/Umbraco.Web.UI/umbraco/config/lang/de.xml               | 3 +--
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml               | 1 -
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml            | 1 -
 9 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 6d5a5949cd..9a6b26aeaf 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -25,7 +25,6 @@
     "jquery-ui": "1.10.3",
     "angular-dynamic-locale": "~0.1.27",
     "tinymce": "~4.1.10",
-    "codemirror": "~5.3.0",
-    "ng-caps-lock": "~1.0.2"
+    "codemirror": "~5.3.0"
   }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/app.dev.js b/src/Umbraco.Web.UI.Client/src/app.dev.js
index e9ad8777d7..e4ce285755 100644
--- a/src/Umbraco.Web.UI.Client/src/app.dev.js
+++ b/src/Umbraco.Web.UI.Client/src/app.dev.js
@@ -7,7 +7,6 @@ var app = angular.module('umbraco', [
     'ngCookies',
     'ngMobile',
     'ngSanitize',
-    'ngCapsLock',
     /*'ui.sortable',*/
     'blueimp.fileupload',
     'tmh.dynamicLocale'
diff --git a/src/Umbraco.Web.UI.Client/src/app.js b/src/Umbraco.Web.UI.Client/src/app.js
index 70968936c5..c541e0776c 100644
--- a/src/Umbraco.Web.UI.Client/src/app.js
+++ b/src/Umbraco.Web.UI.Client/src/app.js
@@ -7,7 +7,6 @@ var app = angular.module('umbraco', [
     'ngCookies',
     'ngSanitize',
     'ngMobile',
-    'ngCapsLock',
     'blueimp.fileupload',
     'tmh.dynamicLocale'
 ]);
diff --git a/src/Umbraco.Web.UI.Client/src/loader.dev.js b/src/Umbraco.Web.UI.Client/src/loader.dev.js
index ff0fe23ecc..2be6593238 100644
--- a/src/Umbraco.Web.UI.Client/src/loader.dev.js
+++ b/src/Umbraco.Web.UI.Client/src/loader.dev.js
@@ -10,8 +10,6 @@ LazyLoad.js(
         'lib/angular/1.1.5/angular-mobile.js',
         'lib/angular/1.1.5/angular-sanitize.min.js',
 
-        'lib/ng-caps-lock/ng-caps-lock.min.js',
-
         'lib/angular/angular-ui-sortable.js',
 
         'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
index d58f8a2fd3..94826b07b4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
@@ -41,7 +41,6 @@
 
                 <div class="control-group" ng-class="{error: loginForm.password.$invalid}">
                     <input type="password" ng-model="password" name="password" class="input-xlarge" localize="placeholder" placeholder="@placeholders_password" autocomplete="off" />
-                    <p class="caps-lock-alert" ng-show="isCapsLockOn"><i class="icon-alert"></i> <localize key="login_capsLockIsOn">Caps Lock is on</localize></p>
                 </div>
 
                 <button type="submit" class="btn" val-trigger-change="#login .form input"><localize key="general_login">Login</localize></button>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index c4bd249314..5282df2253 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -490,6 +490,7 @@
     <key alias="renewSession">Forny for at gemme dine ændringer</key>
   </area>
   <area alias="login">
+
     <key alias="greeting0">Så er det søndag!</key>  
     <key alias="greeting1">Smil, det er mandag!</key>
     <key alias="greeting2">Hurra, det er tirsdag!</key>
@@ -497,9 +498,12 @@
     <key alias="greeting4">Glædelig torsdag!</key>
     <key alias="greeting5">Endelig fredag!</key>
     <key alias="greeting6">Glædelig lørdag</key>
+    
+
     <key alias="instruction">indtast brugernavn og kodeord</key>
     <key alias="timeout">Din session er udløbet</key>
-    <key alias="capsLockIsOn">Caps Lock er slået til</key>
+
+
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index 2cdbb833ab..c6f87964e7 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -531,8 +531,7 @@ Wenn Sie sich für Runway entscheiden, können Sie optional Blöcke nutzen, die
     <key alias="greeting6">Wunderbaren sonnigen Samstag</key>
     <key alias="instruction">Hier anmelden:</key>
     <key alias="timeout">Die Sitzung ist abgelaufen</key>
-    <key alias="capsLockIsOn">Caps Lock ist aktiviert</key>
-    <key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="http://umbraco.com" style="text-decoration: none" target="_blank"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
+	<key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="http://umbraco.com" style="text-decoration: none" target="_blank"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
   </area>
   <area alias="main">
     <key alias="dashboard">Armaturenbrett</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 329431a1e1..582bb077ef 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -561,7 +561,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="greeting6">Happy Caturday</key>
     <key alias="instruction">Log in below</key>
     <key alias="timeout">Session timed out</key>
-    <key alias="capsLockIsOn">Caps Lock is on</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
   </area>
   <area alias="main">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 56ad621f95..c9dcd1554a 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -562,7 +562,6 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="greeting6">Happy Caturday</key>
     <key alias="instruction">Log in below</key>
     <key alias="timeout">Session timed out</key>
-    <key alias="capsLockIsOn">Caps Lock is on</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>  
   </area>
   <area alias="main">

From f62581bd38b666191b75ecfe3a9ee502b7fc6656 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Nov 2015 11:39:49 +0100
Subject: [PATCH 55/68] reverts more of the caps lock

---
 src/Umbraco.Web.UI.Client/gruntFile.js        | 5 +----
 src/Umbraco.Web/UI/JavaScript/JsInitialize.js | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
index b184dee673..8699f4a6f1 100644
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -459,10 +459,7 @@ module.exports = function (grunt) {
                         },
                         'angular-dynamic-locale': {
                             files: ['tmhDynamicLocale.min.js', 'tmhDynamicLocale.min.js.map']
-                        },
-                        'ng-caps-lock': {
-                            files: ['ng-caps-lock.min.js']
-                        },
+                        },                        
                         'codemirror': {
                             files: [
                                 'lib/codemirror.js',
diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
index b0edc302ab..2300fc3217 100644
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -8,9 +8,7 @@
     'lib/angular/1.1.5/angular-cookies.min.js',
     'lib/angular/1.1.5/angular-mobile.js',
     'lib/angular/1.1.5/angular-sanitize.min.js',
-
-    'lib/ng-caps-lock/ng-caps-lock.min.js',
-
+    
     'lib/angular/angular-ui-sortable.js',
 
     'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',

From 3f7293304ddae889f6845d0d211a2bf35a5e58e2 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Nov 2015 11:55:42 +0100
Subject: [PATCH 56/68] removes password change dashboard from release

---
 src/Umbraco.Web.UI/config/Dashboard.Release.config | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/Dashboard.Release.config b/src/Umbraco.Web.UI/config/Dashboard.Release.config
index b933000d0e..4a998b0b80 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.Release.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.Release.config
@@ -72,12 +72,7 @@
         views/dashboard/default/startupdashboardintro.html
       </control>
 
-    </tab>
-      <tab caption="Change Password">
-        <control showOnce="false" addPanel="false" panelCaption="">
-          views/dashboard/ChangePassword.html
-        </control>
-      </tab>
+    </tab>      
   </section>
 
   <section alias="StartupMemberDashboardSection">

From 4baaafd006dac2128d371e361e4eff83f660de2f Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 26 Nov 2015 11:57:23 +0100
Subject: [PATCH 57/68] Also remove change password dashboard from nuget
 package

---
 build/NuSpecs/tools/Dashboard.config.install.xdt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/build/NuSpecs/tools/Dashboard.config.install.xdt b/build/NuSpecs/tools/Dashboard.config.install.xdt
index 605bbb825e..197f9c1b6f 100644
--- a/build/NuSpecs/tools/Dashboard.config.install.xdt
+++ b/build/NuSpecs/tools/Dashboard.config.install.xdt
@@ -62,13 +62,6 @@
         views/dashboard/default/startupdashboardintro.html
       </control>
     </tab>
-    <tab caption="Change password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Change Password" xdt:Transform="Insert">
-      <control showOnce="false" addPanel="false" panelCaption="">
-        views/dashboard/ChangePassword.html
-      </control>
-    </tab>
     <tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
   </section>
   

From 9acbe09449f7b646621ebd6db1c05ec02caebee3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Nov 2015 12:02:08 +0100
Subject: [PATCH 58/68] fixes the tmh dynamic local version, the bower version
 the build server runs has an issue!

---
 src/Umbraco.Web.UI.Client/bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/bower.json b/src/Umbraco.Web.UI.Client/bower.json
index 9a6b26aeaf..a046642ffc 100644
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -23,7 +23,7 @@
     "jquery": "2.0.3",
     "jquery-file-upload": "~9.4.0",
     "jquery-ui": "1.10.3",
-    "angular-dynamic-locale": "~0.1.27",
+    "angular-dynamic-locale": "0.1.27",
     "tinymce": "~4.1.10",
     "codemirror": "~5.3.0"
   }

From fd66f085201d24db4e126396804804629b80b250 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 26 Nov 2015 13:07:22 +0100
Subject: [PATCH 59/68] Fixes setting auth cookie during install, removes some
 try/catch/swallow with some error messaging, converts some String -> string
 and == false updates.

---
 src/Umbraco.Core/ApplicationContext.cs        | 10 +++-
 .../Models/Identity/IdentityModelMappings.cs  | 13 +++++
 src/Umbraco.Core/Models/UserExtensions.cs     |  1 +
 .../Install/HttpInstallAuthorizeAttribute.cs  |  5 +-
 src/Umbraco.Web/Install/InstallHelper.cs      | 14 ++---
 .../Models/Mapping/UserModelMapper.cs         |  2 +-
 src/Umbraco.Web/Security/WebAuthExtensions.cs |  6 +-
 src/Umbraco.Web/Security/WebSecurity.cs       | 58 +++++++++++++++++--
 .../webservices/CheckForUpgrade.asmx.cs       |  9 ++-
 9 files changed, 93 insertions(+), 25 deletions(-)

diff --git a/src/Umbraco.Core/ApplicationContext.cs b/src/Umbraco.Core/ApplicationContext.cs
index 4aef011d05..a05abe2a50 100644
--- a/src/Umbraco.Core/ApplicationContext.cs
+++ b/src/Umbraco.Core/ApplicationContext.cs
@@ -283,7 +283,12 @@ namespace Umbraco.Core
                 {
                     var configStatus = ConfigurationStatus;
                     var currentVersion = UmbracoVersion.GetSemanticVersion();
-                    var ok = configStatus == currentVersion;
+
+                    var ok =
+                        //we are not configured if this is null    
+                        string.IsNullOrWhiteSpace(configStatus) == false
+                        //they must match
+                        && configStatus == currentVersion;
 
                     if (ok)
                     {
@@ -308,8 +313,9 @@ namespace Umbraco.Core
 
                     return ok;
                 }
-                catch
+                catch (Exception ex)
                 {
+                    LogHelper.Error<ApplicationContext>("Error determining if application is configured, returning false", ex);
                     return false;
                 }
 
diff --git a/src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs b/src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
index f57d6683a2..0dc95a8987 100644
--- a/src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
+++ b/src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
@@ -4,6 +4,7 @@ using AutoMapper;
 
 using Umbraco.Core.Models.Mapping;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Security;
 
 namespace Umbraco.Core.Models.Identity
 {
@@ -24,6 +25,18 @@ namespace Umbraco.Core.Models.Identity
                 .ForMember(user => user.UserTypeAlias, expression => expression.MapFrom(user => user.UserType.Alias))
                 .ForMember(user => user.AccessFailedCount, expression => expression.MapFrom(user => user.FailedPasswordAttempts))
                 .ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()));
+
+            config.CreateMap<BackOfficeIdentityUser, UserData>()
+                .ConstructUsing((BackOfficeIdentityUser user) => new UserData(Guid.NewGuid().ToString("N"))) //this is the 'session id'
+                .ForMember(detail => detail.Id, opt => opt.MapFrom(user => user.Id))
+                .ForMember(detail => detail.AllowedApplications, opt => opt.MapFrom(user => user.AllowedSections))
+                .ForMember(detail => detail.RealName, opt => opt.MapFrom(user => user.Name))
+                .ForMember(detail => detail.Roles, opt => opt.MapFrom(user => new[] { user.UserTypeAlias }))
+                .ForMember(detail => detail.StartContentNode, opt => opt.MapFrom(user => user.StartContentId))
+                .ForMember(detail => detail.StartMediaNode, opt => opt.MapFrom(user => user.StartMediaId))
+                .ForMember(detail => detail.Username, opt => opt.MapFrom(user => user.UserName))
+                .ForMember(detail => detail.Culture, opt => opt.MapFrom(user => user.Culture))
+                .ForMember(detail => detail.SessionId, opt => opt.MapFrom(user => user.SecurityStamp.IsNullOrWhiteSpace() ? Guid.NewGuid().ToString("N") : user.SecurityStamp));
         }
 
         private string GetPasswordHash(string storedPass)
diff --git a/src/Umbraco.Core/Models/UserExtensions.cs b/src/Umbraco.Core/Models/UserExtensions.cs
index bd670f3836..5b9f63cf48 100644
--- a/src/Umbraco.Core/Models/UserExtensions.cs
+++ b/src/Umbraco.Core/Models/UserExtensions.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading;
+using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;
 
diff --git a/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs b/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs
index bab2bddc40..4559a42740 100644
--- a/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/Install/HttpInstallAuthorizeAttribute.cs
@@ -5,6 +5,7 @@ using System.Web.Http.Controllers;
 using Umbraco.Core;
 using Umbraco.Web.Security;
 using umbraco.BasePages;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Web.Install
 {
@@ -52,6 +53,7 @@ namespace Umbraco.Web.Install
                     return true;
                 }
                 var umbCtx = GetUmbracoContext();
+
                 //otherwise we need to ensure that a user is logged in
                 var isLoggedIn = GetUmbracoContext().Security.ValidateCurrentUser();
                 if (isLoggedIn)
@@ -60,8 +62,9 @@ namespace Umbraco.Web.Install
                 }
                 return false;
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                LogHelper.Error<HttpInstallAuthorizeAttribute>("An error occurred determining authorization", ex);
                 return false;
             }
 	    }
diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs
index 59e073dc8c..143067f6a1 100644
--- a/src/Umbraco.Web/Install/InstallHelper.cs
+++ b/src/Umbraco.Web/Install/InstallHelper.cs
@@ -103,9 +103,9 @@ namespace Umbraco.Web.Install
                 string userAgent = _umbContext.HttpContext.Request.UserAgent;
 
                 // Check for current install Id
-                Guid installId = Guid.NewGuid();
-                StateHelper.Cookies.Cookie installCookie = new StateHelper.Cookies.Cookie("umb_installId", 1);
-                if (!String.IsNullOrEmpty(installCookie.GetValue()))
+                var installId = Guid.NewGuid();
+                var installCookie = new StateHelper.Cookies.Cookie("umb_installId", 1);
+                if (string.IsNullOrEmpty(installCookie.GetValue()) == false)
                 {
                     if (Guid.TryParse(installCookie.GetValue(), out installId))
                     {
@@ -116,13 +116,13 @@ namespace Umbraco.Web.Install
                 }
                 installCookie.SetValue(installId.ToString());
 
-                string dbProvider = String.Empty;
-                if (!IsBrandNewInstall)
+                string dbProvider = string.Empty;
+                if (IsBrandNewInstall == false)
                     dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
 
                 org.umbraco.update.CheckForUpgrade check = new org.umbraco.update.CheckForUpgrade();
                 check.Install(installId,
-                    !IsBrandNewInstall,
+                    IsBrandNewInstall == false,
                     isCompleted,
                     DateTime.Now,
                     UmbracoVersion.Current.Major,
@@ -135,7 +135,7 @@ namespace Umbraco.Web.Install
             }
             catch (Exception ex)
             {
-
+                LogHelper.Error<InstallHelper>("An error occurred in InstallStatus trying to check upgrades", ex);
             }
         }
 
diff --git a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
index afae0eb122..e1c3cc4f1e 100644
--- a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
@@ -52,7 +52,7 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(detail => detail.Username, opt => opt.MapFrom(user => user.Username))
                 .ForMember(detail => detail.Culture, opt => opt.MapFrom(user => user.GetUserCulture(applicationContext.Services.TextService)))
                 .ForMember(detail => detail.SessionId, opt => opt.MapFrom(user => user.SecurityStamp.IsNullOrWhiteSpace() ? Guid.NewGuid().ToString("N") : user.SecurityStamp));
-
+            
         } 
      
         private static int GetIntId(object id)
diff --git a/src/Umbraco.Web/Security/WebAuthExtensions.cs b/src/Umbraco.Web/Security/WebAuthExtensions.cs
index ec43244b6e..52963d1852 100644
--- a/src/Umbraco.Web/Security/WebAuthExtensions.cs
+++ b/src/Umbraco.Web/Security/WebAuthExtensions.cs
@@ -50,14 +50,14 @@ namespace Umbraco.Web.Security
         /// This will set a an authenticated IPrincipal to the current request given the IUser object
         /// </summary>
         /// <param name="httpContext"></param>
-        /// <param name="user"></param>
+        /// <param name="userData"></param>
         /// <returns></returns>
-        internal static IPrincipal SetPrincipalForRequest(this HttpContextBase httpContext, IUser user)
+        internal static IPrincipal SetPrincipalForRequest(this HttpContextBase httpContext, UserData userData)
         {
             var principal = new ClaimsPrincipal(
                 new UmbracoBackOfficeIdentity(
                     new ClaimsIdentity(),
-                    Mapper.Map<UserData>(user)));
+                    userData));
 
             //It is actually not good enough to set this on the current app Context and the thread, it also needs
             // to be set explicitly on the HttpContext.Current !! This is a strange web api thing that is actually 
diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs
index 1e986dccfc..af6e53ca11 100644
--- a/src/Umbraco.Web/Security/WebSecurity.cs
+++ b/src/Umbraco.Web/Security/WebSecurity.cs
@@ -10,6 +10,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Security;
 using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin;
 using umbraco.businesslogic.Exceptions;
 using Umbraco.Web.Models.ContentEditing;
 using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
@@ -79,6 +80,42 @@ namespace Umbraco.Web.Security
             }
         }
 
+        private BackOfficeSignInManager _signInManager;
+        private BackOfficeSignInManager SignInManager
+        {
+            get
+            {
+                if (_signInManager == null)
+                {
+                    var mgr = _httpContext.GetOwinContext().Get<BackOfficeSignInManager>();
+                    if (mgr == null)
+                    {
+                        throw new NullReferenceException("Could not resolve an instance of " + typeof(BackOfficeSignInManager) + " from the " + typeof(IOwinContext));
+                    }
+                    _signInManager = mgr;
+                }
+                return _signInManager;
+            }
+        }
+
+        private BackOfficeUserManager _userManager;
+        protected BackOfficeUserManager UserManager
+        {
+            get
+            {
+                if (_userManager == null)
+                {
+                    var mgr = _httpContext.GetOwinContext().GetUserManager<BackOfficeUserManager>();
+                    if (mgr == null)
+                    {
+                        throw new NullReferenceException("Could not resolve an instance of " + typeof(BackOfficeUserManager) + " from the " + typeof(IOwinContext) + " GetUserManager method");
+                    }
+                    _userManager = mgr;
+                }
+                return _userManager;
+            }
+        }
+
         /// <summary>
         /// Logs a user in.
         /// </summary>
@@ -87,25 +124,34 @@ namespace Umbraco.Web.Security
         public virtual double PerformLogin(int userId)
         {
             var owinCtx = _httpContext.GetOwinContext();
+            //ensure it's done for owin too
+            owinCtx.Authentication.SignOut(Constants.Security.BackOfficeExternalAuthenticationType);
             
-            var user = _applicationContext.Services.UserService.GetUserById(userId);
-            var userDetail = Mapper.Map<UserDetail>(user);
-            //update the userDetail and set their remaining seconds
-            userDetail.SecondsUntilTimeout = TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes).TotalSeconds;            
-            var principal = _httpContext.SetPrincipalForRequest(user);
-            owinCtx.Authentication.SignIn((UmbracoBackOfficeIdentity)principal.Identity);
+            var user = UserManager.FindByIdAsync(userId).Result;
+            var userData = Mapper.Map<UserData>(user);
+            _httpContext.SetPrincipalForRequest(userData);
+
+            SignInManager.SignInAsync(user, isPersistent: false, rememberBrowser: false).Wait();
             return TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes).TotalSeconds;
         }
 
         [Obsolete("This method should not be used, login is performed by the OWIN pipeline, use the overload that returns double and accepts a UserId instead")]
         public virtual FormsAuthenticationTicket PerformLogin(IUser user)
         {
+            //clear the external cookie - we do this first without owin context because we're writing cookies directly to httpcontext 
+            // and cookie handling is different with httpcontext vs webapi and owin, normally we'd just do:
+            //_httpContext.GetOwinContext().Authentication.SignOut(Constants.Security.BackOfficeExternalAuthenticationType);
+
             var externalLoginCookie = _httpContext.Request.Cookies.Get(Constants.Security.BackOfficeExternalCookieName);
             if (externalLoginCookie != null)
             {
                 externalLoginCookie.Expires = DateTime.Now.AddYears(-1);
                 _httpContext.Response.Cookies.Set(externalLoginCookie);
             }
+
+            //ensure it's done for owin too
+            _httpContext.GetOwinContext().Authentication.SignOut(Constants.Security.BackOfficeExternalAuthenticationType);
+
             var ticket = _httpContext.CreateUmbracoAuthTicket(Mapper.Map<UserData>(user));
             return ticket;
         }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
index 2d6beced38..909b89b96b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
@@ -56,9 +56,8 @@ namespace umbraco.presentation.webservices
 
             // Check for current install Id
             Guid installId = Guid.NewGuid();
-            BusinessLogic.StateHelper.Cookies.Cookie installCookie = 
-                new BusinessLogic.StateHelper.Cookies.Cookie("umb_installId", 1);
-            if (!String.IsNullOrEmpty(installCookie.GetValue()))
+            var installCookie = new BusinessLogic.StateHelper.Cookies.Cookie("umb_installId", 1);
+            if (string.IsNullOrEmpty(installCookie.GetValue()) == false)
             {
                 if (Guid.TryParse(installCookie.GetValue(), out installId))
                 {
@@ -70,8 +69,8 @@ namespace umbraco.presentation.webservices
             }
             installCookie.SetValue(installId.ToString());
 
-            string dbProvider = String.Empty;
-            if (!String.IsNullOrEmpty(global::Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus))
+            string dbProvider = string.Empty;
+            if (string.IsNullOrEmpty(global::Umbraco.Core.Configuration.GlobalSettings.ConfigurationStatus) == false)
             dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
 
             var check = new global::Umbraco.Web.org.umbraco.update.CheckForUpgrade();

From 2c4403f892c958e7dbc148e2903b94e1377c4d1b Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Thu, 26 Nov 2015 13:08:47 +0100
Subject: [PATCH 60/68] Fixes image that was missing from the build

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 422d1bd079..3f6db6c46c 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1856,6 +1856,7 @@
     <Content Include="Umbraco\Images\Editor\newdocument.gif" />
     <Content Include="Umbraco\Images\Editor\opacity.png" />
     <Content Include="Umbraco\Images\Editor\outdent.gif" />
+    <Content Include="Umbraco\Images\Editor\renderbody.gif" />
     <Content Include="Umbraco\Images\Editor\removeformat.gif" />
     <Content Include="Umbraco\Images\Editor\separator.gif" />
     <Content Include="Umbraco\Images\Editor\showStyles.png" />

From c16d0b77c2d46d64397f132e01109475e70946de Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Fri, 27 Nov 2015 12:59:15 +0100
Subject: [PATCH 61/68] Actually save the domain

---
 src/Umbraco.Web/WebServices/DomainsApiController.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Umbraco.Web/WebServices/DomainsApiController.cs b/src/Umbraco.Web/WebServices/DomainsApiController.cs
index 8c146f2670..3ea24135a7 100644
--- a/src/Umbraco.Web/WebServices/DomainsApiController.cs
+++ b/src/Umbraco.Web/WebServices/DomainsApiController.cs
@@ -114,7 +114,10 @@ namespace Umbraco.Web.WebServices
                 names.Add(name);
                 var domain = domains.FirstOrDefault(d => d.DomainName.InvariantEquals(domainModel.Name));
                 if (domain != null)
+                {
                     domain.LanguageId = language.Id;
+                    Services.DomainService.Save(domain);
+                }
                 else if (Services.DomainService.Exists(domainModel.Name))
                 {
                     domainModel.Duplicate = true;

From 8e6bbc3df9db5f52d264c1b64b2dc8c029dd6286 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 27 Nov 2015 16:25:39 +0100
Subject: [PATCH 62/68] Ensures that written cookies are done so consistently
 based on the UmbracoBackOfficeCookieAuthOptions. Ensures that when a webforms
 page requests token renewal that the token is not always renewed for the
 request, it checks if the tokens expiry correctly and only renews when
 necessary so the cookie is not written each time. Fixes the
 ForceRenewalCookieAuthenticationHandler to only write a cookie if the request
 is for a request that is not normally auth'd (i.e. is a webforms form that
 exists outside the normal /umbraco path ... legacy).

---
 .../Security/Identity/AppBuilderExtensions.cs |  2 +-
 .../Identity/BackOfficeCookieManager.cs       |  7 +-
 ...ForceRenewalCookieAuthenticationHandler.cs | 82 +++++++++++--------
 ...ceRenewalCookieAuthenticationMiddleware.cs | 13 ++-
 .../Identity/GetUserSecondsMiddleWare.cs      | 10 +--
 .../UmbracoBackOfficeCookieAuthOptions.cs     | 25 ++++++
 6 files changed, 90 insertions(+), 49 deletions(-)

diff --git a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
index 946810ffc9..755eafedcb 100644
--- a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
@@ -172,7 +172,7 @@ namespace Umbraco.Web.Security.Identity
             app.UseStageMarker(PipelineStage.Authenticate);
             
             //Then our custom middlewares
-            app.Use(typeof(ForceRenewalCookieAuthenticationMiddleware), app, options);
+            app.Use(typeof(ForceRenewalCookieAuthenticationMiddleware), app, options, new SingletonUmbracoContextAccessor());
             app.UseStageMarker(PipelineStage.Authenticate);
             app.Use(typeof(FixWindowsAuthMiddlware));
             app.UseStageMarker(PipelineStage.Authenticate);
diff --git a/src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs b/src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
index 06ce201ef9..c78a918fd9 100644
--- a/src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
+++ b/src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
@@ -50,6 +50,7 @@ namespace Umbraco.Web.Security.Identity
         /// </summary>
         /// <param name="ctx"></param>
         /// <param name="originalRequestUrl"></param>
+        /// <param name="checkForceAuthTokens"></param>
         /// <returns></returns>
         /// <remarks>
         /// We auth the request when:
@@ -58,14 +59,14 @@ namespace Umbraco.Web.Security.Identity
         /// * it is a /base request
         /// * it is a preview request
         /// </remarks>
-        internal static bool ShouldAuthenticateRequest(IOwinContext ctx, Uri originalRequestUrl)
+        internal bool ShouldAuthenticateRequest(IOwinContext ctx, Uri originalRequestUrl, bool checkForceAuthTokens = true)
         {
             var request = ctx.Request;
             var httpCtx = ctx.TryGetHttpContext();
             
             if (//check the explicit flag
-                ctx.Get<bool?>("umbraco-force-auth") != null
-                || (httpCtx.Success && httpCtx.Result.Items["umbraco-force-auth"] != null)
+                (checkForceAuthTokens && ctx.Get<bool?>("umbraco-force-auth") != null)
+                || (checkForceAuthTokens && httpCtx.Success && httpCtx.Result.Items["umbraco-force-auth"] != null)
                 //check back office
                 || request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath)
                 //check installer
diff --git a/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationHandler.cs b/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationHandler.cs
index 24beb708f7..c7030b2558 100644
--- a/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationHandler.cs
+++ b/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationHandler.cs
@@ -1,3 +1,5 @@
+using System;
+using Umbraco.Core;
 using System.Threading.Tasks;
 using Microsoft.Owin;
 using Microsoft.Owin.Security;
@@ -11,6 +13,13 @@ namespace Umbraco.Web.Security.Identity
     /// </summary>
     internal class ForceRenewalCookieAuthenticationHandler : AuthenticationHandler<CookieAuthenticationOptions>
     {
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+
+        public ForceRenewalCookieAuthenticationHandler(IUmbracoContextAccessor umbracoContextAccessor)
+        {
+            _umbracoContextAccessor = umbracoContextAccessor;
+        }
+
         /// <summary>
         /// This handler doesn't actually do any auth so we return null;
         /// </summary>
@@ -45,7 +54,20 @@ namespace Umbraco.Web.Security.Identity
         /// <returns></returns>
         protected override Task ApplyResponseGrantAsync()
         {
-            //Now we need to check if we should force renew this based on a flag in the context
+            if (_umbracoContextAccessor.Value == null || Context.Request.Uri.IsClientSideRequest())
+            {
+                return Task.FromResult(0);
+            }
+
+            //Now we need to check if we should force renew this based on a flag in the context and whether this is a request that is not normally renewed by OWIN...
+            // which means that it is not a normal URL that is authenticated.
+
+            var normalAuthUrl = ((BackOfficeCookieManager) Options.CookieManager)
+                .ShouldAuthenticateRequest(Context, _umbracoContextAccessor.Value.OriginalRequestUrl,
+                    //Pass in false, we want to know if this is a normal auth'd page
+                    checkForceAuthTokens: false);
+            //This is auth'd normally, so OWIN will naturally take care of the cookie renewal
+            if (normalAuthUrl) return Task.FromResult(0);
 
             var httpCtx = Context.TryGetHttpContext();
             //check for the special flag in either the owin or http context
@@ -62,45 +84,39 @@ namespace Umbraco.Web.Security.Identity
                 if (shouldSignin == false && shouldSignout == false)
                 {
                     //get the ticket
-                    var model = GetTicket();
-                    if (model != null)
+                    var ticket = GetTicket();
+                    if (ticket != null)
                     {
                         var currentUtc = Options.SystemClock.UtcNow;
-                        var issuedUtc = model.Properties.IssuedUtc;
-                        var expiresUtc = model.Properties.ExpiresUtc;
+                        var issuedUtc = ticket.Properties.IssuedUtc;
+                        var expiresUtc = ticket.Properties.ExpiresUtc;
 
                         if (expiresUtc.HasValue && issuedUtc.HasValue)
                         {
-                            //renew the date/times
-                            model.Properties.IssuedUtc = currentUtc;
-                            var timeSpan = expiresUtc.Value.Subtract(issuedUtc.Value);
-                            model.Properties.ExpiresUtc = currentUtc.Add(timeSpan);
+                            var timeElapsed = currentUtc.Subtract(issuedUtc.Value);
+                            var timeRemaining = expiresUtc.Value.Subtract(currentUtc);
 
-                            //now save back all the required cookie details
-                            var cookieValue = Options.TicketDataFormat.Protect(model);
-                            var cookieOptions = new CookieOptions
+                            //if it's time to renew, then do it
+                            if (timeRemaining < timeElapsed)
                             {
-                                Domain = Options.CookieDomain,
-                                HttpOnly = Options.CookieHttpOnly,
-                                Path = Options.CookiePath ?? "/",
-                            };
-                            if (Options.CookieSecure == CookieSecureOption.SameAsRequest)
-                            {
-                                cookieOptions.Secure = Request.IsSecure;
-                            }
-                            else
-                            {
-                                cookieOptions.Secure = Options.CookieSecure == CookieSecureOption.Always;
-                            }
-                            if (model.Properties.IsPersistent)
-                            {
-                                cookieOptions.Expires = model.Properties.ExpiresUtc.Value.ToUniversalTime().DateTime;
-                            }
-                            Options.CookieManager.AppendResponseCookie(
-                                Context,
-                                Options.CookieName,
-                                cookieValue,
-                                cookieOptions);
+                                //renew the date/times
+                                ticket.Properties.IssuedUtc = currentUtc;
+                                var timeSpan = expiresUtc.Value.Subtract(issuedUtc.Value);
+                                ticket.Properties.ExpiresUtc = currentUtc.Add(timeSpan);
+
+                                //now save back all the required cookie details
+                                var cookieValue = Options.TicketDataFormat.Protect(ticket);
+
+                                var cookieOptions = ((UmbracoBackOfficeCookieAuthOptions)Options).CreateRequestCookieOptions(Context, ticket);                                
+
+                                Options.CookieManager.AppendResponseCookie(
+                                    Context,
+                                    Options.CookieName,
+                                    cookieValue,
+                                    cookieOptions);
+                            }                            
+
+                            
                         }
                     }
                 }
diff --git a/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationMiddleware.cs b/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationMiddleware.cs
index e159a1c847..77a7a335f0 100644
--- a/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationMiddleware.cs
+++ b/src/Umbraco.Web/Security/Identity/ForceRenewalCookieAuthenticationMiddleware.cs
@@ -10,13 +10,20 @@ namespace Umbraco.Web.Security.Identity
     /// </summary>
     internal class ForceRenewalCookieAuthenticationMiddleware : CookieAuthenticationMiddleware
     {
-        public ForceRenewalCookieAuthenticationMiddleware(OwinMiddleware next, IAppBuilder app, CookieAuthenticationOptions options) : base(next, app, options)
+        private readonly IUmbracoContextAccessor _umbracoContextAccessor;
+
+        public ForceRenewalCookieAuthenticationMiddleware(
+            OwinMiddleware next, 
+            IAppBuilder app, 
+            UmbracoBackOfficeCookieAuthOptions options,
+            IUmbracoContextAccessor umbracoContextAccessor) : base(next, app, options)
         {
-        }        
+            _umbracoContextAccessor = umbracoContextAccessor;
+        }
 
         protected override AuthenticationHandler<CookieAuthenticationOptions> CreateHandler()
         {
-            return new ForceRenewalCookieAuthenticationHandler();
+            return new ForceRenewalCookieAuthenticationHandler(_umbracoContextAccessor);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
index c3ce720fa5..a1f4c67681 100644
--- a/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
@@ -80,15 +80,7 @@ namespace Umbraco.Web.Security.Identity
 
                             var cookieValue = _authOptions.TicketDataFormat.Protect(ticket);
 
-                            var cookieOptions = new CookieOptions
-                            {
-                                Path = "/",
-                                Domain = _authOptions.CookieDomain ?? null,
-                                Expires = DateTime.Now.AddMinutes(30),
-                                HttpOnly = true,
-                                Secure = _authOptions.CookieSecure == CookieSecureOption.Always
-                                         || (_authOptions.CookieSecure == CookieSecureOption.SameAsRequest && request.Uri.Scheme.InvariantEquals("https")),
-                            };
+                            var cookieOptions = _authOptions.CreateRequestCookieOptions(context, ticket);
 
                             _authOptions.CookieManager.AppendResponseCookie(
                                 context,
diff --git a/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs b/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
index 957cb66b0a..397b438f35 100644
--- a/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
+++ b/src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Microsoft.Owin;
+using Microsoft.Owin.Security;
 using Microsoft.Owin.Security.Cookies;
 using Umbraco.Core;
 using Umbraco.Core.Configuration;
@@ -20,6 +22,29 @@ namespace Umbraco.Web.Security.Identity
         {            
         }
 
+        public CookieOptions CreateRequestCookieOptions(IOwinContext ctx, AuthenticationTicket ticket)
+        {
+            if (ctx == null) throw new ArgumentNullException("ctx");
+            if (ticket == null) throw new ArgumentNullException("ticket");
+
+            var cookieOptions = new CookieOptions
+            {
+                Path = "/",
+                Domain = this.CookieDomain ?? null,
+                Expires = DateTime.Now.AddMinutes(30),
+                HttpOnly = true,
+                Secure = this.CookieSecure == CookieSecureOption.Always
+                                         || (this.CookieSecure == CookieSecureOption.SameAsRequest && ctx.Request.IsSecure),
+            };
+
+            if (ticket.Properties.IsPersistent && ticket.Properties.ExpiresUtc.HasValue)
+            {
+                cookieOptions.Expires = ticket.Properties.ExpiresUtc.Value.ToUniversalTime().DateTime;
+            }
+
+            return cookieOptions;
+        }
+
         public UmbracoBackOfficeCookieAuthOptions(            
             ISecuritySection securitySection, 
             int loginTimeoutMinutes, 

From c4860a490fe9389dad81875c99aac874bcccbcbe Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 27 Nov 2015 16:43:02 +0100
Subject: [PATCH 63/68] Ensures that GetUserSecondsMiddleWare uses the
 SystemClock for UTC Now, ensures that it only extends the ticket when
 necessary and not everytime this middleware is called - the same logic that
 OWIN normally renews tickets with, this means the cookie is not written
 everytime this request is made.

---
 .../Identity/GetUserSecondsMiddleWare.cs      | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs b/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
index a1f4c67681..814520a49c 100644
--- a/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
+++ b/src/Umbraco.Web/Security/Identity/GetUserSecondsMiddleWare.cs
@@ -24,6 +24,7 @@ namespace Umbraco.Web.Security.Identity
         private readonly UmbracoBackOfficeCookieAuthOptions _authOptions;
         private readonly ISecuritySection _security;
         private readonly ILogger _logger;
+        private const int PersistentLoginSlidingMinutes = 30;
 
         public GetUserSecondsMiddleWare(
             OwinMiddleware next,
@@ -59,7 +60,7 @@ namespace Umbraco.Web.Security.Identity
                     if (ticket != null)
                     {
                         var remainingSeconds = ticket.Properties.ExpiresUtc.HasValue
-                            ? (ticket.Properties.ExpiresUtc.Value - DateTime.Now.ToUniversalTime()).TotalSeconds
+                            ? (ticket.Properties.ExpiresUtc.Value - _authOptions.SystemClock.UtcNow).TotalSeconds
                             : 0;
 
                         response.ContentType = "application/json; charset=utf-8";
@@ -67,28 +68,41 @@ namespace Umbraco.Web.Security.Identity
                         response.Headers.Add("Cache-Control", new[] { "no-cache" });
                         response.Headers.Add("Pragma", new[] { "no-cache" });
                         response.Headers.Add("Expires", new[] { "-1" });
-                        response.Headers.Add("Date", new[] { DateTime.Now.ToUniversalTime().ToString("R") });
+                        response.Headers.Add("Date", new[] { _authOptions.SystemClock.UtcNow.ToString("R") });
 
                         //Ok, so here we need to check if we want to process/renew the auth ticket for each 
                         // of these requests. If that is the case, the user will really never be logged out until they
                         // close their browser (there will be edge cases of that, especially when debugging)
                         if (_security.KeepUserLoggedIn)
                         {
-                            var utcNow = DateTime.Now.ToUniversalTime();
-                            ticket.Properties.IssuedUtc = utcNow;
-                            ticket.Properties.ExpiresUtc = utcNow.AddMinutes(30);
+                            var currentUtc = _authOptions.SystemClock.UtcNow;
+                            var issuedUtc = ticket.Properties.IssuedUtc;
+                            var expiresUtc = ticket.Properties.ExpiresUtc;
 
-                            var cookieValue = _authOptions.TicketDataFormat.Protect(ticket);
+                            if (expiresUtc.HasValue && issuedUtc.HasValue)
+                            {
+                                var timeElapsed = currentUtc.Subtract(issuedUtc.Value);
+                                var timeRemaining = expiresUtc.Value.Subtract(currentUtc);
 
-                            var cookieOptions = _authOptions.CreateRequestCookieOptions(context, ticket);
+                                //if it's time to renew, then do it
+                                if (timeRemaining < timeElapsed)
+                                {
+                                    ticket.Properties.IssuedUtc = currentUtc;
+                                    ticket.Properties.ExpiresUtc = currentUtc.AddMinutes(PersistentLoginSlidingMinutes);
 
-                            _authOptions.CookieManager.AppendResponseCookie(
-                                context,
-                                _authOptions.CookieName,
-                                cookieValue,
-                                cookieOptions);
+                                    var cookieValue = _authOptions.TicketDataFormat.Protect(ticket);
 
-                            remainingSeconds = (ticket.Properties.ExpiresUtc.Value - DateTime.Now.ToUniversalTime()).TotalSeconds;
+                                    var cookieOptions = _authOptions.CreateRequestCookieOptions(context, ticket);
+
+                                    _authOptions.CookieManager.AppendResponseCookie(
+                                        context,
+                                        _authOptions.CookieName,
+                                        cookieValue,
+                                        cookieOptions);
+
+                                    remainingSeconds = (ticket.Properties.ExpiresUtc.Value - currentUtc).TotalSeconds;
+                                }
+                            }                            
                         }
                         else if (remainingSeconds <= 30)
                         {

From 610efe552da2d2840bde42e713cf0454892c378c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 27 Nov 2015 16:54:02 +0100
Subject: [PATCH 64/68] Bumps version

---
 build/UmbracoVersion.txt                         | 2 +-
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt
index a95586e703..a32aeaace9 100644
--- a/build/UmbracoVersion.txt
+++ b/build/UmbracoVersion.txt
@@ -1,2 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.3.2
\ No newline at end of file
+7.3.3
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index e28fdabe91..04719befd9 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/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.3.2");
+        private static readonly Version Version = new Version("7.3.3");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 3f6db6c46c..d5504bae18 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -40,7 +40,8 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
+    <IISExpressSSLPort>
+    </IISExpressSSLPort>
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
@@ -2414,7 +2415,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>7310</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7320</IISUrl>
+          <IISUrl>http://localhost:7330</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

From 87100feb3d95d7bd050cdf0c4d09f566ecb8c2f0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 27 Nov 2015 21:23:24 +0100
Subject: [PATCH 65/68] Fixes: U4-7467 Umbraco 7.3.2 Clean install, OWIN error
 after database creation and bumps version

---
 src/SolutionInfo.cs                           |  4 +-
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj      |  2 +-
 .../Security/Identity/AppBuilderExtensions.cs | 52 ++++++++-----------
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index b10616ec36..a58f46be1b 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.3.1")]
-[assembly: AssemblyInformationalVersion("7.3.1")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("7.3.3")]
+[assembly: AssemblyInformationalVersion("7.3.3")]
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index d5504bae18..320f6dc22d 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2413,7 +2413,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7310</DevelopmentServerPort>
+          <DevelopmentServerPort>7330</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:7330</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
diff --git a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
index 755eafedcb..f608edaca4 100644
--- a/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
+++ b/src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
@@ -47,9 +47,6 @@ namespace Umbraco.Web.Security.Identity
             if (appContext == null) throw new ArgumentNullException("appContext");
             if (userMembershipProvider == null) throw new ArgumentNullException("userMembershipProvider");
 
-            //Don't proceed if the app is not ready
-            if (appContext.IsUpgrading == false && appContext.IsConfigured == false) return;
-
             //Configure Umbraco user manager to be created per request
             app.CreatePerOwinContext<BackOfficeUserManager>(
                 (options, owinContext) => BackOfficeUserManager.Create(
@@ -78,9 +75,6 @@ namespace Umbraco.Web.Security.Identity
             if (userMembershipProvider == null) throw new ArgumentNullException("userMembershipProvider");
             if (customUserStore == null) throw new ArgumentNullException("customUserStore");
 
-            //Don't proceed if the app is not ready
-            if (appContext.IsUpgrading == false && appContext.IsConfigured == false) return;
-
             //Configure Umbraco user manager to be created per request
             app.CreatePerOwinContext<BackOfficeUserManager>(
                 (options, owinContext) => BackOfficeUserManager.Create(
@@ -107,9 +101,6 @@ namespace Umbraco.Web.Security.Identity
             if (appContext == null) throw new ArgumentNullException("appContext");
             if (userManager == null) throw new ArgumentNullException("userManager");
 
-            //Don't proceed if the app is not ready
-            if (appContext.IsUpgrading == false && appContext.IsConfigured == false) return;
-
             //Configure Umbraco user manager to be created per request
             app.CreatePerOwinContext<TManager>(userManager);
 
@@ -127,10 +118,7 @@ namespace Umbraco.Web.Security.Identity
         {
             if (app == null) throw new ArgumentNullException("app");
             if (appContext == null) throw new ArgumentNullException("appContext");
-
-            //Don't proceed if the app is not ready
-            if (appContext.IsUpgrading == false && appContext.IsConfigured == false) return app;
-
+            
             var authOptions = new UmbracoBackOfficeCookieAuthOptions(
                 UmbracoConfig.For.UmbracoSettings().Security,
                 GlobalSettings.TimeOutInMinutes,
@@ -148,19 +136,23 @@ namespace Umbraco.Web.Security.Identity
                             identity => identity.GetUserId<int>()),                    
                 }
             };
+            
+            app.UseUmbracoBackOfficeCookieAuthentication(authOptions, appContext);
 
-            //This is a custom middleware, we need to return the user's remaining logged in seconds
-            app.Use<GetUserSecondsMiddleWare>(
-                authOptions,
-                UmbracoConfig.For.UmbracoSettings().Security,
-                app.CreateLogger<GetUserSecondsMiddleWare>());
-
-            app.UseUmbracoBackOfficeCookieAuthentication(authOptions);
+            //don't apply if app isnot ready
+            if (appContext.IsUpgrading || appContext.IsConfigured)
+            {
+                //This is a custom middleware, we need to return the user's remaining logged in seconds
+                app.Use<GetUserSecondsMiddleWare>(
+                    authOptions,
+                    UmbracoConfig.For.UmbracoSettings().Security,
+                    app.CreateLogger<GetUserSecondsMiddleWare>());
+            }
 
             return app;
         }
 
-        internal static IAppBuilder UseUmbracoBackOfficeCookieAuthentication(this IAppBuilder app, CookieAuthenticationOptions options)
+        internal static IAppBuilder UseUmbracoBackOfficeCookieAuthentication(this IAppBuilder app, CookieAuthenticationOptions options, ApplicationContext appContext)
         {
             if (app == null)
             {
@@ -170,12 +162,17 @@ namespace Umbraco.Web.Security.Identity
             //First the normal cookie middleware
             app.Use(typeof(CookieAuthenticationMiddleware), app, options);
             app.UseStageMarker(PipelineStage.Authenticate);
+
+            //don't apply if app isnot ready
+            if (appContext.IsUpgrading || appContext.IsConfigured)
+            {
+                //Then our custom middlewares
+                app.Use(typeof(ForceRenewalCookieAuthenticationMiddleware), app, options, new SingletonUmbracoContextAccessor());
+                app.UseStageMarker(PipelineStage.Authenticate);
+                app.Use(typeof(FixWindowsAuthMiddlware));
+                app.UseStageMarker(PipelineStage.Authenticate);
+            }
             
-            //Then our custom middlewares
-            app.Use(typeof(ForceRenewalCookieAuthenticationMiddleware), app, options, new SingletonUmbracoContextAccessor());
-            app.UseStageMarker(PipelineStage.Authenticate);
-            app.Use(typeof(FixWindowsAuthMiddlware));
-            app.UseStageMarker(PipelineStage.Authenticate);
 
             return app;
         }
@@ -192,9 +189,6 @@ namespace Umbraco.Web.Security.Identity
             if (app == null) throw new ArgumentNullException("app");
             if (appContext == null) throw new ArgumentNullException("appContext");
 
-            //Don't proceed if the app is not ready
-            if (appContext.IsUpgrading == false && appContext.IsConfigured == false) return app;
-
             app.UseCookieAuthentication(new CookieAuthenticationOptions
             {
                 AuthenticationType = Constants.Security.BackOfficeExternalAuthenticationType,

From e11b5c3fdb2c37ba17dd91a2aef12642537fca7c Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Mon, 30 Nov 2015 18:13:51 +0100
Subject: [PATCH 66/68] Fixes: U4-7220 Upgrading 4.9.0 to 7.3.0 fails due to
 missing UniqueID field on cmsPropertyType table

Migration happening in 6.0.2 failing due to use of a PropertyTypeDto type where we have added UniqueId in 7.3.0.
---
 .../UpdatePropertyTypesAndGroups.cs           | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
index 6598719454..c0d2d79446 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
@@ -28,37 +28,38 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixZeroOne
         {
             if (database != null)
             {
-                //Fetch all PropertyTypes that belongs to a PropertyTypeGroup                
+				//Fetch all PropertyTypes that belongs to a PropertyTypeGroup                
                 //NOTE: We are writing the full query because we've added a column to the PropertyTypeDto in later versions so one of the columns
                 // won't exist yet
-                var propertyTypes = database.Fetch<PropertyTypeDto>("SELECT * FROM cmsPropertyType WHERE propertyTypeGroupId > 0");
+				//NOTE: We're using dynamic to avoid having this migration fail due to the UniqueId column added in 7.3 (this column is not added
+				// in the table yet and will make the mapping of done by Fetch fail when the actual type is used here).
+                var propertyTypes = database.Fetch<dynamic>("SELECT * FROM cmsPropertyType WHERE propertyTypeGroupId > 0");
 
                 var propertyGroups = database.Fetch<PropertyTypeGroupDto>("WHERE id > 0");
 
                 foreach (var propertyType in propertyTypes)
                 {
                     //Get the PropertyTypeGroup that the current PropertyType references
-                    var parentPropertyTypeGroup = propertyGroups.FirstOrDefault(x => x.Id == propertyType.PropertyTypeGroupId);
+                    var parentPropertyTypeGroup = propertyGroups.FirstOrDefault(x => x.Id == propertyType.propertyTypeGroupId);
                     if (parentPropertyTypeGroup != null)
                     {
                         //If the ContentType is the same on the PropertyType and the PropertyTypeGroup the group is valid and we skip to the next
-                        if (parentPropertyTypeGroup.ContentTypeNodeId == propertyType.ContentTypeId) continue;
+                        if (parentPropertyTypeGroup.ContentTypeNodeId == propertyType.contentTypeId) continue;
 
                         //Check if the 'new' PropertyTypeGroup has already been created
                         var existingPropertyTypeGroup =
                             propertyGroups.FirstOrDefault(
                                 x =>
                                 x.ParentGroupId == parentPropertyTypeGroup.Id && x.Text == parentPropertyTypeGroup.Text &&
-                                x.ContentTypeNodeId == propertyType.ContentTypeId);
+                                x.ContentTypeNodeId == propertyType.contentTypeId);
 
                         //This should ensure that we don't create duplicate groups for a single ContentType
                         if (existingPropertyTypeGroup == null)
                         {
-
                             //Create a new PropertyTypeGroup that references the parent group that the PropertyType was referencing pre-6.0.1
                             var propertyGroup = new PropertyTypeGroupDto
                                                     {
-                                                        ContentTypeNodeId = propertyType.ContentTypeId,
+                                                        ContentTypeNodeId = propertyType.contentTypeId,
                                                         ParentGroupId = parentPropertyTypeGroup.Id,
                                                         Text = parentPropertyTypeGroup.Text,
                                                         SortOrder = parentPropertyTypeGroup.SortOrder
@@ -69,19 +70,18 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixZeroOne
                             propertyGroup.Id = id;
                             propertyGroups.Add(propertyGroup);
                             //Update the reference to the new PropertyTypeGroup on the current PropertyType
-                            propertyType.PropertyTypeGroupId = id;
-                            database.Update(propertyType);
+                            propertyType.propertyTypeGroupId = id;
+							database.Update("cmsPropertyType", "id", propertyType);
                         }
                         else
                         {
-                            //Update the reference to the existing PropertyTypeGroup on the current PropertyType
-                            propertyType.PropertyTypeGroupId = existingPropertyTypeGroup.Id;
-                            database.Update(propertyType);
+							//Update the reference to the existing PropertyTypeGroup on the current PropertyType
+							propertyType.propertyTypeGroupId = existingPropertyTypeGroup.Id;
+							database.Update("cmsPropertyType", "id", propertyType);
                         }
                     }
                 }
             }
-
             return string.Empty;
         }
     }

From 25d8fc7a13991473778caded5b0809a9b5e73a0e Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Mon, 30 Nov 2015 19:18:57 +0100
Subject: [PATCH 67/68] Fixing split separator for thumbnailSizes in
 FileUploadPropertyValueEditor.

---
 .../PropertyEditors/FileUploadPropertyValueEditor.cs           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
index 8692744089..e4ff4da1d6 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
@@ -137,8 +137,7 @@ namespace Umbraco.Web.PropertyEditors
                                 {
                                     var thumbnailSizes = thumbs.First().Value.Value;
                                     // additional thumbnails configured as prevalues on the DataType
-                                    var sep = (thumbnailSizes.Contains("") == false && thumbnailSizes.Contains(",")) ? ',' : ';';
-                                    foreach (var thumb in thumbnailSizes.Split(sep))
+									foreach (var thumb in thumbnailSizes.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries))
                                     {
                                         int thumbSize;
                                         if (thumb == "" || int.TryParse(thumb, out thumbSize) == false) continue;

From bfbc6595fb165063fde40f653fbc27feb112a858 Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Mon, 30 Nov 2015 19:29:23 +0100
Subject: [PATCH 68/68] Fixed a few more split separators.

---
 src/Umbraco.Core/Models/ContentExtensions.cs              | 3 +--
 src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs
index 88b6308c29..e91996e32a 100644
--- a/src/Umbraco.Core/Models/ContentExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentExtensions.cs
@@ -560,8 +560,7 @@ namespace Umbraco.Core.Models
                         //Additional thumbnails configured as prevalues on the DataType
                         if (thumbnailSizes != null)
                         {
-                            var sep = (thumbnailSizes.Contains("") == false && thumbnailSizes.Contains(",")) ? ',' : ';';
-                            foreach (var thumb in thumbnailSizes.Split(sep))
+							foreach (var thumb in thumbnailSizes.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries))
                             {
                                 int thumbSize;
                                 if (thumb != "" && int.TryParse(thumb, out thumbSize))
diff --git a/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs b/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
index fad101b596..12f151876d 100644
--- a/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
+++ b/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs
@@ -89,9 +89,7 @@ namespace umbraco.cms.businesslogic.datatype
                             // additional thumbnails configured as prevalues on the DataType
                             if (_thumbnailSizes != "")
                             {
-                                char sep = (_thumbnailSizes.Contains("") == false && _thumbnailSizes.Contains(",")) ? ',' : ';';
-
-                                foreach (string thumb in _thumbnailSizes.Split(sep))
+								foreach (var thumb in _thumbnailSizes.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries))
                                 {
                                     int thumbSize;
                                     if (thumb != "" && int.TryParse(thumb, out thumbSize))