From ed87789abe2dd64aafd0e28533f729c295e0b2cc Mon Sep 17 00:00:00 2001 From: Daniel Sune Andreasen Date: Mon, 27 Feb 2017 11:14:37 +0100 Subject: [PATCH 1/6] collides with .legacy-custom-file --- src/Umbraco.Web.UI.Client/src/less/tree.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less index 4e2e3e77e8..013b60ce19 100644 --- a/src/Umbraco.Web.UI.Client/src/less/tree.less +++ b/src/Umbraco.Web.UI.Client/src/less/tree.less @@ -40,7 +40,7 @@ .umb-tree li.current > div i.icon, .umb-tree li.current > div ins { color: white !important; - background: @blue; + background-color: @blue; border-color: @blue; } .umb-tree li.root > div { From 9acfd8f5d23edb774bd682fa7e9af24b67cd69c7 Mon Sep 17 00:00:00 2001 From: James Coxhead Date: Thu, 2 Mar 2017 21:02:25 +0000 Subject: [PATCH 2/6] Updated dashboard config transform Fix for dupicate dashboards after upgrading --- .../tools/Dashboard.config.install.xdt | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/build/NuSpecs/tools/Dashboard.config.install.xdt b/build/NuSpecs/tools/Dashboard.config.install.xdt index 8368870186..036beeba29 100644 --- a/build/NuSpecs/tools/Dashboard.config.install.xdt +++ b/build/NuSpecs/tools/Dashboard.config.install.xdt @@ -41,16 +41,6 @@ views/dashboard/developer/examinemanagement.html - - - views/dashboard/developer/healthcheck.html - - - - - views/dashboard/developer/redirecturls.html - -
@@ -80,4 +70,26 @@
+ +
+ + content + + + + views/dashboard/developer/redirecturls.html + + +
+ +
+ + developer + + + + views/dashboard/developer/healthcheck.html + + +
\ No newline at end of file From b080825bb28a1d4bcbcb78e3bafae20b750fd4ad Mon Sep 17 00:00:00 2001 From: Michael Razmgah Date: Mon, 6 Mar 2017 21:31:42 +0100 Subject: [PATCH 3/6] Updating sv.xml with correct translation --- src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index 259b914a72..24b9231e60 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -87,7 +87,7 @@ Välj aktuell mapp Förhandsgranska Förhandsgranskning är avstängt på grund av att det inte finns någon mall tilldelad - Ångra + Annat Välj stil Visa stil Infoga tabell @@ -936,4 +936,4 @@ Översättare Din profil - \ No newline at end of file + From 8a133938e688ca23e3d327bd90b1d8a2e53ff93b Mon Sep 17 00:00:00 2001 From: nengberg Date: Wed, 8 Mar 2017 09:57:32 +0100 Subject: [PATCH 4/6] Adds missing swedish translation for document type without template --- src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index 24b9231e60..aeaf8bd49b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -171,6 +171,7 @@ "dokumenttyper".]]> "mediatyper".]]> Välj typ och rubrik + Dokumenttyp utan sidmall Surfa på din webbplats From b8c0d4c4ea83521abaae7b234292bbf04d594da1 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 9 Mar 2017 11:35:06 +0100 Subject: [PATCH 5/6] U4-9595 - improve log error msg on thread aborts on timeouts --- src/Umbraco.Core/Logging/Logger.cs | 31 ++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Core/Logging/Logger.cs b/src/Umbraco.Core/Logging/Logger.cs index ae8bb60fcd..66cad59733 100644 --- a/src/Umbraco.Core/Logging/Logger.cs +++ b/src/Umbraco.Core/Logging/Logger.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.IO; using System.Linq; +using System.Reflection; using System.Threading; using System.Web; using log4net; @@ -62,12 +63,34 @@ namespace Umbraco.Core.Logging public void Error(Type callingType, string message, Exception exception) { - var logger = LogManager.GetLogger(callingType); - if (logger != null) - logger.Error((message), exception); + var logger = LogManager.GetLogger(callingType); + if (logger == null) return; + + if (IsTimeoutThreadAbortException(exception)) + { + message += "\r\nThe thread has been aborted, because the request has timed out."; + } + + logger.Error(message, exception); } - public void Warn(Type callingType, string message, params Func[] formatItems) + private static bool IsTimeoutThreadAbortException(Exception exception) + { + var abort = exception as ThreadAbortException; + if (abort == null) return false; + + if (abort.ExceptionState == null) return false; + + var stateType = abort.ExceptionState.GetType(); + if (stateType.FullName != "System.Web.HttpApplication+CancelModuleException") return false; + + var timeoutField = stateType.GetField("_timeout", BindingFlags.Instance | BindingFlags.NonPublic); + if (timeoutField == null) return false; + + return (bool) timeoutField.GetValue(abort.ExceptionState); + } + + public void Warn(Type callingType, string message, params Func[] formatItems) { var logger = LogManager.GetLogger(callingType); if (logger == null || logger.IsWarnEnabled == false) return; From 1b7ce8bcdec2966d0178ba64fbc6ba54287225fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Gregersen?= Date: Sun, 12 Mar 2017 21:20:24 +0100 Subject: [PATCH 6/6] Removed weird comment removed "this" as remark for NewPassword --- src/Umbraco.Web/Models/ChangingPasswordModel.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Umbraco.Web/Models/ChangingPasswordModel.cs b/src/Umbraco.Web/Models/ChangingPasswordModel.cs index 7d70d00a9e..bc11a53316 100644 --- a/src/Umbraco.Web/Models/ChangingPasswordModel.cs +++ b/src/Umbraco.Web/Models/ChangingPasswordModel.cs @@ -10,9 +10,6 @@ namespace Umbraco.Web.Models /// /// The password value /// - /// - /// This - /// [DataMember(Name = "newPassword")] public string NewPassword { get; set; } @@ -40,4 +37,4 @@ namespace Umbraco.Web.Models [DataMember(Name = "generatedPassword")] public string GeneratedPassword { get; set; } } -} \ No newline at end of file +}