From aeff33d0a61b32c6a63879256b300ba9d4311b93 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 15:17:55 -0200 Subject: [PATCH 1/9] Bump version number --- build/Build.bat | 2 +- src/Umbraco.Core/Configuration/GlobalSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Build.bat b/build/Build.bat index 25cf8ba4c5..f79e2d82e7 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,5 +1,5 @@ @ECHO OFF -set version=4.11.8 +set version=4.11.9 %windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%version% echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 2280289242..269cd11ca7 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -28,7 +28,7 @@ namespace Umbraco.Core.Configuration #region Private static fields // CURRENT UMBRACO VERSION ID - private const string CurrentUmbracoVersion = "4.11.8"; + private const string CurrentUmbracoVersion = "4.11.9"; private static readonly object Locker = new object(); //make this volatile so that we can ensure thread safety with a double check lock From f36ab37f6a0d90eb636c6573c38898578124678b Mon Sep 17 00:00:00 2001 From: dmilic Date: Mon, 13 May 2013 15:49:59 -1200 Subject: [PATCH 2/9] Fix for the U4-2229 issue - broken PublishWithSubs method --- src/umbraco.cms/businesslogic/web/Document.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index aea0d8153a..fb2fce38d7 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -1273,7 +1273,7 @@ and node.nodeObjectType=@nodeObjectType"; Guid newVersion = createNewVersion(versionDate); SqlHelper.ExecuteNonQuery("insert into cmsDocument (nodeId, published, documentUser, versionId, updateDate, Text) " - + "values (" + Id + ", 0, " + u.Id + ", @versionId, @text)", + + "values (" + Id + ", 0, " + u.Id + ", @versionId, @updateDate, @text)", SqlHelper.CreateParameter("@versionId", newVersion), SqlHelper.CreateParameter("@updateDate", versionDate), SqlHelper.CreateParameter("@text", Text)); From d3ed90c23e7abacaa3f1143df1c972c4e38459e6 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 12:10:29 -0200 Subject: [PATCH 3/9] Some fixes & refactor --- .../WebServices/FolderBrowserService.cs | 56 ++++---- .../UltimatePickerAutoCompleteHandler.ashx.cs | 135 +++++------------- 2 files changed, 71 insertions(+), 120 deletions(-) diff --git a/src/Umbraco.Web/WebServices/FolderBrowserService.cs b/src/Umbraco.Web/WebServices/FolderBrowserService.cs index 02132356f0..e463494d30 100644 --- a/src/Umbraco.Web/WebServices/FolderBrowserService.cs +++ b/src/Umbraco.Web/WebServices/FolderBrowserService.cs @@ -1,16 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Web; using System.Web.Script.Serialization; -using Umbraco.Core; using Umbraco.Web.Media.ThumbnailProviders; -using umbraco.BasePages; using umbraco.BusinessLogic; -using umbraco.IO; +using Umbraco.Core.IO; using umbraco.cms.businesslogic.Tags; -using umbraco.cms.businesslogic.media; using Umbraco.Web.BaseRest; namespace Umbraco.Web.WebServices @@ -21,26 +16,20 @@ namespace Umbraco.Web.WebServices [RestExtensionMethod(ReturnXml = false)] public static string GetChildren(int parentId) { + var currentUser = GetCurrentUser(); + var parentMedia = new global::umbraco.cms.businesslogic.media.Media(parentId); - var currentUser = User.GetCurrent(); + AuthorizeAccess(parentMedia, currentUser); + var data = new List(); - // Check user is logged in - if (currentUser == null) - throw new UnauthorizedAccessException("You must be logged in to use this service"); - - // Check user is allowed to access selected media item - if(!("," + parentMedia.Path + ",").Contains("," + currentUser.StartMediaId + ",")) - throw new UnauthorizedAccessException("You do not have access to this Media node"); - // Get children and filter //TODO: Only fetch files, not containers //TODO: Cache responses to speed up susequent searches foreach (var child in parentMedia.Children) { var fileProp = child.getProperty("umbracoFile") ?? - child.GenericProperties.FirstOrDefault(x => - x.PropertyType.DataTypeDefinition.DataType.Id == new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); + child.GenericProperties.FirstOrDefault(x => x.PropertyType.DataTypeDefinition.DataType.Id == new Guid("5032a6e6-69e3-491d-bb28-cd31cd11086c")); var fileUrl = fileProp != null ? fileProp.Value.ToString() : ""; var thumbUrl = ThumbnailProvidersResolver.Current.GetThumbnailUrl(fileUrl); @@ -53,9 +42,9 @@ namespace Umbraco.Web.WebServices MediaTypeAlias = child.ContentType.Alias, EditUrl = string.Format("editMedia.aspx?id={0}", child.Id), FileUrl = fileUrl, - ThumbnailUrl = !string.IsNullOrEmpty(thumbUrl) - ? thumbUrl - : IOHelper.ResolveUrl(SystemDirectories.Umbraco + "/images/thumbnails/" + child.ContentType.Thumbnail) + ThumbnailUrl = string.IsNullOrEmpty(thumbUrl) + ? IOHelper.ResolveUrl(SystemDirectories.Umbraco + "/images/thumbnails/" + child.ContentType.Thumbnail) + : thumbUrl }; data.Add(item); @@ -67,15 +56,19 @@ namespace Umbraco.Web.WebServices [RestExtensionMethod(ReturnXml = false)] public static string Delete(string nodeIds) { - var nodeIdParts = nodeIds.Split(','); + var currentUser = GetCurrentUser(); - foreach (var nodeIdPart in nodeIdParts.Where(x => !string.IsNullOrEmpty(x))) + var nodeIdParts = nodeIds.Split(','); + + foreach (var nodeIdPart in nodeIdParts.Where(x => string.IsNullOrEmpty(x) == false)) { - var nodeId = 0; - if (!Int32.TryParse(nodeIdPart, out nodeId)) + int nodeId; + if (Int32.TryParse(nodeIdPart, out nodeId) == false) continue; var node = new global::umbraco.cms.businesslogic.media.Media(nodeId); + AuthorizeAccess(node, currentUser); + node.delete(("," + node.Path + ",").Contains(",-21,")); } @@ -84,5 +77,20 @@ namespace Umbraco.Web.WebServices success = true }); } + + private static User GetCurrentUser() + { + var currentUser = User.GetCurrent(); + if (currentUser == null) + throw new UnauthorizedAccessException("You must be logged in to use this service"); + + return currentUser; + } + + private static void AuthorizeAccess(global::umbraco.cms.businesslogic.media.Media mediaItem, User currentUser) + { + if (("," + mediaItem.Path + ",").Contains("," + currentUser.StartMediaId + ",") == false) + throw new UnauthorizedAccessException("You do not have access to this Media node"); + } } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx.cs index 8fa77e7a8b..8d2acf4f8f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/UltimatePickerAutoCompleteHandler.ashx.cs @@ -1,9 +1,9 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.Services; using Umbraco.Web.WebServices; +using umbraco.BasePages; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic; @@ -25,77 +25,44 @@ namespace umbraco.presentation.umbraco.webservices public override void ProcessRequest(HttpContext context) { - //user must be allowed to see content or media - if (!AuthorizeRequest(DefaultApps.content.ToString()) && !AuthorizeRequest(DefaultApps.media.ToString())) - return; + if (BasePage.ValidateUserContextID(BasePage.umbracoUserContextID) == false) + throw new Exception("Client authorization failed. User is not logged in"); + //user must be allowed to see content or media + if (AuthorizeRequest(DefaultApps.content.ToString()) == false && AuthorizeRequest(DefaultApps.media.ToString()) == false) + return; context.Response.ContentType = "text/plain"; _prefix = context.Request.QueryString["q"]; - int parentNodeId = Convert.ToInt32(context.Request.QueryString["id"]); - bool showGrandChildren = Convert.ToBoolean(context.Request.QueryString["showchildren"]); + var parentNodeId = Convert.ToInt32(context.Request.QueryString["id"]); + var showGrandChildren = Convert.ToBoolean(context.Request.QueryString["showchildren"]); - string documentAliasFilter = context.Request.QueryString["filter"]; - string[] documentAliasFilters = documentAliasFilter.Split(",".ToCharArray()); + var documentAliasFilter = context.Request.QueryString["filter"]; + var documentAliasFilters = documentAliasFilter.Split(",".ToCharArray()); + var parent = new CMSNode(parentNodeId); - CMSNode parent = new CMSNode(parentNodeId); - if (!showGrandChildren) + _nodeCount = 0; + + //store children array here because iterating over an Array property object is very inneficient. + var children = parent.Children; + foreach (CMSNode child in children) { - _nodeCount = 0; - - //store children array here because iterating over an Array property object is very inneficient. - var children = parent.Children; - foreach (CMSNode child in children) - { - - - NodeChildrenCount(child, false, documentAliasFilters); - - } - - _output = new string[_nodeCount]; - - _counter = 0; - int level = 1; - - //why is there a 2nd iteration of the same thing here? - foreach (CMSNode child in children) - { - - AddNode(child, level, showGrandChildren, documentAliasFilters); - } - - - } - else - { - _nodeCount = 0; - - //store children array here because iterating over an Array property object is very inneficient. - var children = parent.Children; - foreach (CMSNode child in children) - { - NodeChildrenCount(child, true, documentAliasFilters); - } - - _output = new string[_nodeCount]; - _counter = 0; - int level = 1; - - foreach (CMSNode child in children) - { - AddNode(child, level, showGrandChildren, documentAliasFilters); - } - - - + NodeChildrenCount(child, showGrandChildren, documentAliasFilters); } + _output = new string[_nodeCount]; + _counter = 0; + int level = 1; - foreach (string item in _output) + foreach (CMSNode child in children) + { + AddNode(child, level, showGrandChildren, documentAliasFilters); + } + + foreach (var item in _output) { context.Response.Write(item + Environment.NewLine); } @@ -103,38 +70,21 @@ namespace umbraco.presentation.umbraco.webservices private bool ValidNode(string nodeText) { - - - if (nodeText.Length >= _prefix.Length) - { - - - if (nodeText.Substring(0, _prefix.Length).ToLower() == _prefix.ToLower()) - { - return true; - } - } - - return false; + return nodeText.Length >= _prefix.Length && nodeText.Substring(0, _prefix.Length).ToLower() == _prefix.ToLower(); } private void NodeChildrenCount(CMSNode node, bool countChildren, string[] documentAliasFilters) { if (documentAliasFilters.Length > 0) { - - foreach (string filter in documentAliasFilters) + foreach (var filter in documentAliasFilters) { - string trimmedFilter = filter.TrimStart(" ".ToCharArray()); + var trimmedFilter = filter.TrimStart(" ".ToCharArray()); trimmedFilter = trimmedFilter.TrimEnd(" ".ToCharArray()); - if (new Document(node.Id).ContentType.Alias == trimmedFilter || trimmedFilter == string.Empty) + if ((new Document(node.Id).ContentType.Alias == trimmedFilter || trimmedFilter == string.Empty) && ValidNode(node.Text)) { - if (ValidNode(node.Text)) - { - _nodeCount += 1; - } - + _nodeCount += 1; } } } @@ -160,28 +110,24 @@ namespace umbraco.presentation.umbraco.webservices private void AddNode(CMSNode node, int level, bool showGrandChildren, string[] documentAliasFilters) { + var preText = string.Empty; - string preText = string.Empty; - - for (int i = 1; i < level; i++) + for (var i = 1; i < level; i++) { preText += "- "; } if (documentAliasFilters.Length > 0) { - foreach (string filter in documentAliasFilters) + foreach (var filter in documentAliasFilters) { - string trimmedFilter = filter.TrimStart(" ".ToCharArray()); + var trimmedFilter = filter.TrimStart(" ".ToCharArray()); trimmedFilter = trimmedFilter.TrimEnd(" ".ToCharArray()); - if (new Document(node.Id).ContentType.Alias == trimmedFilter || trimmedFilter == string.Empty) + if ((new Document(node.Id).ContentType.Alias == trimmedFilter || trimmedFilter == string.Empty) && ValidNode(node.Text)) { - if (ValidNode(node.Text)) - { - _output[_counter] = preText + node.Text + " [" + node.Id + "]"; - _counter++; - } + _output[_counter] = preText + node.Text + " [" + node.Id + "]"; + _counter++; } } @@ -211,10 +157,7 @@ namespace umbraco.presentation.umbraco.webservices public override bool IsReusable { - get - { - return false; - } + get { return false; } } } } From f484dbf0fccc96b6328b4fe7b2a153f1d2500685 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 12:37:29 -0200 Subject: [PATCH 4/9] Fix merge issue --- .../WebServices/FolderBrowserService.cs | 69 ++++++++++++------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/src/Umbraco.Web/WebServices/FolderBrowserService.cs b/src/Umbraco.Web/WebServices/FolderBrowserService.cs index 63eb497e69..4ff68b944b 100644 --- a/src/Umbraco.Web/WebServices/FolderBrowserService.cs +++ b/src/Umbraco.Web/WebServices/FolderBrowserService.cs @@ -13,7 +13,7 @@ using Umbraco.Web.BaseRest; namespace Umbraco.Web.WebServices { - //TODO: Can we convert this to MVC please instead of /base? + //TODO: Can we convert this to MVC please instead of /base? [RestExtension("FolderBrowserService")] public class FolderBrowserService @@ -21,22 +21,13 @@ namespace Umbraco.Web.WebServices [RestExtensionMethod(ReturnXml = false)] public static string GetChildren(int parentId) { - var service = ApplicationContext.Current.Services.EntityService; - var parentMedia = service.Get(parentId, UmbracoObjectTypes.Media); - var mediaPath = parentMedia == null ? parentId.ToString(CultureInfo.InvariantCulture) : parentMedia.Path; - - var currentUser = User.GetCurrent(); - var data = new List(); - - // Check user is logged in - if (currentUser == null) - throw new UnauthorizedAccessException("You must be logged in to use this service"); - - // Check user is allowed to access selected media item - if (!("," + mediaPath + ",").Contains("," + currentUser.StartMediaId + ",")) - throw new UnauthorizedAccessException("You do not have access to this Media node"); + var currentUser = GetCurrentUser(); + AuthorizeAccess(parentId, currentUser); // Get children and filter + var data = new List(); + var service = ApplicationContext.Current.Services.EntityService; + var entities = service.GetChildren(parentId, UmbracoObjectTypes.Media); //TODO: Only fetch files, not containers foreach (UmbracoEntity entity in entities) @@ -51,9 +42,9 @@ namespace Umbraco.Web.WebServices MediaTypeAlias = entity.ContentTypeAlias, EditUrl = string.Format("editMedia.aspx?id={0}", entity.Id), FileUrl = entity.UmbracoFile, - ThumbnailUrl = !string.IsNullOrEmpty(thumbUrl) - ? thumbUrl - : IOHelper.ResolveUrl(SystemDirectories.Umbraco + "/images/thumbnails/" + entity.ContentTypeThumbnail) + ThumbnailUrl = string.IsNullOrEmpty(thumbUrl) + ? IOHelper.ResolveUrl(string.Format("{0}/images/thumbnails/{1}", SystemDirectories.Umbraco, entity.ContentTypeThumbnail)) + : thumbUrl }; data.Add(item); @@ -65,22 +56,48 @@ namespace Umbraco.Web.WebServices [RestExtensionMethod(ReturnXml = false)] public static string Delete(string nodeIds) { + var currentUser = GetCurrentUser(); + var nodeIdParts = nodeIds.Split(','); - foreach (var nodeIdPart in nodeIdParts.Where(x => !string.IsNullOrEmpty(x))) + foreach (var nodeIdPart in nodeIdParts.Where(x => string.IsNullOrEmpty(x) == false)) { - var nodeId = 0; - if (!Int32.TryParse(nodeIdPart, out nodeId)) + int nodeId; + if (Int32.TryParse(nodeIdPart, out nodeId) == false) continue; - + var node = new global::umbraco.cms.businesslogic.media.Media(nodeId); + AuthorizeAccess(node, currentUser); + node.delete(("," + node.Path + ",").Contains(",-21,")); } - return new JavaScriptSerializer().Serialize(new - { - success = true - }); + return new JavaScriptSerializer().Serialize(new { success = true }); + } + + private static User GetCurrentUser() + { + var currentUser = User.GetCurrent(); + if (currentUser == null) + throw new UnauthorizedAccessException("You must be logged in to use this service"); + + return currentUser; + } + + private static void AuthorizeAccess(global::umbraco.cms.businesslogic.media.Media mediaItem, User currentUser) + { + if (("," + mediaItem.Path + ",").Contains("," + currentUser.StartMediaId + ",") == false) + throw new UnauthorizedAccessException("You do not have access to this Media node"); + } + + private static void AuthorizeAccess(int parentId, User currentUser) + { + var service = ApplicationContext.Current.Services.EntityService; + var parentMedia = service.Get(parentId, UmbracoObjectTypes.Media); + var mediaPath = parentMedia == null ? parentId.ToString(CultureInfo.InvariantCulture) : parentMedia.Path; + + if (("," + mediaPath + ",").Contains("," + currentUser.StartMediaId + ",") == false) + throw new UnauthorizedAccessException("You do not have access to this Media node"); } } } From 2f61bc27c8b8c3c01c01480cbe207d81b5765471 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 15:15:32 -0200 Subject: [PATCH 5/9] Bump version number --- build/Build.bat | 2 +- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Build.bat b/build/Build.bat index f2849f0824..cca902903f 100644 --- a/build/Build.bat +++ b/build/Build.bat @@ -1,5 +1,5 @@ @ECHO OFF -SET release=6.0.5 +SET release=6.0.6 SET comment= SET version=%release% diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index c4c47524b3..df60984a54 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration { public class UmbracoVersion { - private static readonly Version Version = new Version("6.0.5"); + private static readonly Version Version = new Version("6.0.6"); /// /// Gets the current version of Umbraco. From 13a86624ff234dd3b848fd92034b6f3eb4039b37 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 15:39:12 -0200 Subject: [PATCH 6/9] Fixes U4-2248 Spelling error in back office --- .../umbraco_client/FolderBrowser/Js/folderbrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js index 802b160003..762d8ebdf2 100644 --- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js +++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js @@ -173,7 +173,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); var self = this; // Inject the upload overlay - var instructions = 'draggable' in document.createElement('span') ? "

Drag files here to upload

\

Or, click the button below to chose the items to upload

" : "

Click the browse button below to chose the items to upload

"; + var instructions = 'draggable' in document.createElement('span') ? "

Drag files here to upload

\

Or, click the button below to choose the items to upload

" : "

Click the browse button below to chose the items to upload

"; var overlay = $("
" + "
" + From 7ecbc3b3912875793d037632720e247b83348937 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 28 May 2013 15:44:59 -0200 Subject: [PATCH 7/9] Fixes U4-2248 Spelling error in back office --- .../umbraco_client/FolderBrowser/Js/folderbrowser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js index 762d8ebdf2..a8132ae7c7 100644 --- a/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js +++ b/src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js @@ -173,7 +173,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls"); var self = this; // Inject the upload overlay - var instructions = 'draggable' in document.createElement('span') ? "

Drag files here to upload

\

Or, click the button below to choose the items to upload

" : "

Click the browse button below to chose the items to upload

"; + var instructions = 'draggable' in document.createElement('span') ? "

Drag files here to upload

\

Or, click the button below to choose the items to upload

" : "

Click the browse button below to choose the items to upload

"; var overlay = $("
" + "
" + From 5041e6fcc41a8b09901e84dcd90b912ad45c8bd1 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Tue, 28 May 2013 13:24:48 -1000 Subject: [PATCH 8/9] Updated to latest CDF version that has a few bug fixes and added a CDF logger. --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 8 ++-- .../config/ClientDependency.Release.config | 2 +- .../config/ClientDependency.config | 6 +-- src/Umbraco.Web.UI/packages.config | 4 +- src/Umbraco.Web/UI/CdfLogger.cs | 40 +++++++++++++++++++ src/Umbraco.Web/Umbraco.Web.csproj | 5 ++- src/Umbraco.Web/packages.config | 2 +- src/umbraco.cms/packages.config | 2 +- src/umbraco.cms/umbraco.cms.csproj | 4 +- src/umbraco.controls/packages.config | 2 +- src/umbraco.controls/umbraco.controls.csproj | 4 +- src/umbraco.editorControls/packages.config | 2 +- .../umbraco.editorControls.csproj | 4 +- src/umbraco.macroRenderings/packages.config | 2 +- .../umbraco.macroRenderings.csproj | 4 +- 15 files changed, 66 insertions(+), 25 deletions(-) create mode 100644 src/Umbraco.Web/UI/CdfLogger.cs diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 1ffe861698..b343c6d1b9 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -100,13 +100,13 @@ {07fbc26b-2927-4a22-8d96-d644c667fecc} UmbracoExamine - + False - ..\packages\ClientDependency.1.6.0.0\lib\ClientDependency.Core.dll + ..\packages\ClientDependency.1.7.0.1\lib\ClientDependency.Core.dll - + False - ..\packages\ClientDependency-Mvc.1.6.0.0\lib\ClientDependency.Core.Mvc.dll + ..\packages\ClientDependency-Mvc.1.7.0.0\lib\ClientDependency.Core.Mvc.dll False diff --git a/src/Umbraco.Web.UI/config/ClientDependency.Release.config b/src/Umbraco.Web.UI/config/ClientDependency.Release.config index f1072853ef..75eba648cc 100644 --- a/src/Umbraco.Web.UI/config/ClientDependency.Release.config +++ b/src/Umbraco.Web.UI/config/ClientDependency.Release.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - + diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config index f2bc1255b9..e71cef5626 100644 --- a/src/Umbraco.Web.UI/config/ClientDependency.config +++ b/src/Umbraco.Web.UI/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - + @@ -30,8 +30,8 @@ NOTES: - -