From 7548074fa390e44a706eb4e98bfccbfff27a093a Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 16 Sep 2021 10:39:49 +0200 Subject: [PATCH 1/9] Fix incorrect attribute (cherry picked from commit 6c512107a4687ce02a36bc482215219386876c0e) --- src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html index d0ebd994f978..93cacef8c8c4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html @@ -1 +1 @@ - \ No newline at end of file + From a09103dc82e523d931b622b47895bf9d11dbfed4 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Sun, 19 Sep 2021 20:35:43 +0200 Subject: [PATCH 2/9] Align sortable handle vertically in multivalues prevalue editor (cherry picked from commit 46e6f050cbab33cb6898ecf5b618cea42fc3aee8) --- .../src/less/components/prevalues/multivalues.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less b/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less index 6cdc5b1c997e..48d581b3137b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less @@ -45,15 +45,15 @@ &.ui-sortable-handle, .ui-sortable-handle, - .handle - { + .handle { cursor: move; } - i { + .umb-icon, + i.icon { display: flex; - align-items: center; - margin-right: 5px + align-self: center; + margin-right: 5px; } a { From f776dbb6162c469751c9582e8029849e7630ea95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Strijkert?= Date: Mon, 20 Sep 2021 13:53:41 +0200 Subject: [PATCH 3/9] Missing nl translation for blockEditor_addBlock (cherry picked from commit 674edd3a97c0d5383af9358f365a065e606267ce) --- src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml index b50f49ad8ebc..04c6fb2ce72d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml @@ -2342,6 +2342,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Fout! Het Elementtype van dit blok bestaat niet meer + Inhoud toevoegen Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in blokken. From 52f3350e7629e522fe0d82c25a794624d990e8b4 Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Sun, 19 Sep 2021 14:01:09 +0200 Subject: [PATCH 4/9] Adjust icon in umb-checkbox and ensure icon is centered (cherry picked from commit c49c5369e305773b646329e0b682c2d82ef87a50) --- .../src/less/components/umb-form-check.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less index f13ae198d622..bb4af5e05cac 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less @@ -97,7 +97,8 @@ .icon, .umb-icon { - font-size: 1.2rem; + font-size: 0.9rem; + line-height: 1; } &__state { @@ -110,6 +111,8 @@ &__check { display: flex; + align-items: center; + justify-content: center; position: relative; background: @white; border: 1px solid @inputBorder; From e269d1bcd04e379fd2e50db990401d71b3dfcd7b Mon Sep 17 00:00:00 2001 From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com> Date: Wed, 22 Sep 2021 01:49:49 +0200 Subject: [PATCH 5/9] Grid: Add button styling fix (#10978) * Add missing focus styling * Ensure add button is perfectly rounded and remove unused / uneeded CSS. * Remove redundant border-color property * Revert removal of unused css Co-authored-by: BatJan Co-authored-by: Jan Skovgaard Olsen (cherry picked from commit 31ecc146d1ad34a4540a84e7753877c753ae5ab4) --- .../src/less/components/umb-grid.less | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less index b92d1db05ac2..98438a344726 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less @@ -565,12 +565,11 @@ // ICONS // ------------------------- .umb-grid .iconBox { - padding: 4px 6px; - display: inline-block; - cursor: pointer; + padding: 6px; + display: flex; border-radius: 200px; border: 1px solid @ui-action-discreet-border; - margin: 2px; + margin: 0 auto; &:hover, &:hover * { background: @ui-action-discreet-type-hover !important; @@ -599,8 +598,6 @@ -webkit-appearance: none; background-image: linear-gradient(to bottom,@gray-9,@gray-7); background-repeat: repeat-x; - zoom: 1; - border-color: @gray-7 @gray-7 @gray-6; border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25); box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05); border-radius: 3px; From b6268e36505ece94d2ba5f8b4d2842ce59dedaae Mon Sep 17 00:00:00 2001 From: Jan Skovgaard <1932158+BatJan@users.noreply.github.com> Date: Tue, 14 Sep 2021 07:54:46 +0200 Subject: [PATCH 6/9] Bump version to 8.17.0-rc2 --- src/SolutionInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 143df3dc4617..e18eabbfc8f0 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -19,4 +19,4 @@ // these are FYI and changed automatically [assembly: AssemblyFileVersion("8.17.0")] -[assembly: AssemblyInformationalVersion("8.17.0-rc")] +[assembly: AssemblyInformationalVersion("8.17.0-rc2")] From 5c0e42e1cbf60b06214a29afb27eb35baf873b7f Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 10 Sep 2021 10:31:38 -0600 Subject: [PATCH 7/9] Allows replacing MainDom with alternate DB There are some cases where there is a complex hosting strategy and folks want a readonly database and are hosting on Azure. In that case, it is not entirely possible to have a readonly Umbraco database because SqlMainDom is required and part of that requirement is to have read/write access to the umbraco key value table. This PR allows for the default MainDom to be replaced and to allow for an SqlMainDomLock to use an alternate connection string so that a separate read/write database can be used. (cherry picked from commit 9f48a9f940b9fee7a09fe4a2f2062c33f455eeb4) --- src/Umbraco.Core/Runtime/MainDom.cs | 2 +- src/Umbraco.Core/Runtime/SqlMainDomLock.cs | 6 +++--- src/Umbraco.Web/UmbracoApplication.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Core/Runtime/MainDom.cs b/src/Umbraco.Core/Runtime/MainDom.cs index d784560f2c04..b5404c62b2c5 100644 --- a/src/Umbraco.Core/Runtime/MainDom.cs +++ b/src/Umbraco.Core/Runtime/MainDom.cs @@ -19,7 +19,7 @@ namespace Umbraco.Core.Runtime /// When an AppDomain starts, it tries to acquire the main domain status. /// When an AppDomain stops (eg the application is restarting) it should release the main domain status. /// - internal class MainDom : IMainDom, IRegisteredObject, IDisposable + public class MainDom : IMainDom, IRegisteredObject, IDisposable { #region Vars diff --git a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs index 12359c96d102..8e38fa74c418 100644 --- a/src/Umbraco.Core/Runtime/SqlMainDomLock.cs +++ b/src/Umbraco.Core/Runtime/SqlMainDomLock.cs @@ -18,7 +18,7 @@ namespace Umbraco.Core.Runtime { - internal class SqlMainDomLock : IMainDomLock + public class SqlMainDomLock : IMainDomLock { private readonly TimeSpan _lockTimeout; private string _lockId; @@ -33,14 +33,14 @@ internal class SqlMainDomLock : IMainDomLock private object _locker = new object(); private bool _hasTable = false; - public SqlMainDomLock(ILogger logger) + public SqlMainDomLock(ILogger logger, string connectionStringName = Constants.System.UmbracoConnectionName) { // unique id for our appdomain, this is more unique than the appdomain id which is just an INT counter to its safer _lockId = Guid.NewGuid().ToString(); _logger = logger; _dbFactory = new UmbracoDatabaseFactory( - Constants.System.UmbracoConnectionName, + connectionStringName, _logger, new Lazy(() => new MapperCollection(Enumerable.Empty()))); diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs index c96e21e34870..563d553ac25a 100644 --- a/src/Umbraco.Web/UmbracoApplication.cs +++ b/src/Umbraco.Web/UmbracoApplication.cs @@ -76,7 +76,7 @@ protected virtual string GetBootErrorFileName() /// /// Returns a new MainDom /// - protected IMainDom GetMainDom(ILogger logger) + protected virtual IMainDom GetMainDom(ILogger logger) { // Determine if we should use the sql main dom or the default var appSettingMainDomLock = ConfigurationManager.AppSettings[Constants.AppSettings.MainDomLock]; From 97ecb07be768a39946c7bfc24ebaba22d2e7f5dc Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 30 Sep 2021 10:07:05 +0200 Subject: [PATCH 8/9] Fixes #11206 (#11225) --- src/Umbraco.Core/Composing/CompositionExtensions/Services.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs index d252c58730ed..d97845928dcb 100644 --- a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs +++ b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs @@ -52,6 +52,7 @@ public static Composition ComposeServices(this Composition composition) composition.RegisterUnique(); composition.RegisterUnique(); composition.RegisterUnique(); + composition.RegisterUnique(); composition.Register(SourcesFactory); composition.RegisterUnique(factory => new LocalizedTextService( factory.GetInstance>(), From 11ad3fc0827488d42ddb62ca639183cea6005054 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 30 Sep 2021 10:16:33 +0200 Subject: [PATCH 9/9] Bump version to 8.17.0 --- src/SolutionInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index e18eabbfc8f0..cc6296de4a37 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -19,4 +19,4 @@ // these are FYI and changed automatically [assembly: AssemblyFileVersion("8.17.0")] -[assembly: AssemblyInformationalVersion("8.17.0-rc2")] +[assembly: AssemblyInformationalVersion("8.17.0")]