From af5455a500c95baee7f134dca274ae93e221469c Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 23 Aug 2016 10:52:29 +0200 Subject: [PATCH 01/20] Bumps version --- build/UmbracoVersion.txt | 2 +- src/SolutionInfo.cs | 4 ++-- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index b035e059fb..21d0941aa0 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.5.1 \ No newline at end of file +7.5.2 \ No newline at end of file diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 4c746b1009..0905976f77 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -11,5 +11,5 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("7.5.1")] -[assembly: AssemblyInformationalVersion("7.5.1")] \ No newline at end of file +[assembly: AssemblyFileVersion("7.5.2")] +[assembly: AssemblyInformationalVersion("7.5.2")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 6b84ca7ea9..0284c84f0a 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.5.1"); + private static readonly Version Version = new Version("7.5.2"); /// /// 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 aa461053d3..bf62640506 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2412,9 +2412,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" True True - 7510 + 7520 / - http://localhost:7510 + http://localhost:7520 False False From ae591d488328e0ada87c13abde12c8952ac29e1b Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 1 Sep 2016 14:19:12 +0200 Subject: [PATCH 02/20] U4-8889 Package install fails Fixes one of the problems with installing packages (when 1 file needs to be copied to multiple places) and adds better logging for other potential problems --- .../businesslogic/Packager/Installer.cs | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index 6b4f9edde2..46e101425c 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -285,13 +285,46 @@ namespace umbraco.cms.businesslogic.packager else if (File.Exists(destFile)) File.Delete(destFile); - // Move the file - File.Move(sourceFile, destFile); + // Copy the file + // SJ: Note - this used to do a move but some packages included the same file to be + // copied to multiple locations like so: + // + // + // my-icon.png + // /umbraco/Images/ + // my-icon.png + // + // + // my-icon.png + // /App_Plugins/MyPlugin/Images + // my-icon.png + // + // + // Since this file unzips as a flat list of files, moving the file the first time means + // that when you try to do that a second time, it would result in a FileNotFoundException + try + { + File.Copy(sourceFile, destFile); + } + catch (Exception exception) + { + // Make sure to log the error before throwing so package devs know where to look for the problem + LogHelper.Error(string.Format("Error copying file from {0} to {1}", sourceFile, destFile), exception); + throw; + } //PPH log file install insPack.Data.Files.Add(XmlHelper.GetNodeValue(n.SelectSingleNode("orgPath")) + "/" + XmlHelper.GetNodeValue(n.SelectSingleNode("orgName"))); } + // Once we're done copying, remove all the files + foreach (XmlNode n in Config.DocumentElement.SelectNodes("//file")) + { + var sourceFile = GetFileName(tempDir, XmlHelper.GetNodeValue(n.SelectSingleNode("guid"))); + if (File.Exists(sourceFile)) + File.Delete(sourceFile); + } + // log that a user has install files if (_currentUserId > -1) { @@ -302,7 +335,7 @@ namespace umbraco.cms.businesslogic.packager insPack.Save(); - + } } @@ -331,7 +364,7 @@ namespace umbraco.cms.businesslogic.packager currentUser = userById; } } - + //Xml as XElement which is used with the new PackagingService var rootElement = Config.DocumentElement.GetXElement(); @@ -504,15 +537,15 @@ namespace umbraco.cms.businesslogic.packager RequirementsPatch = int.Parse(Config.DocumentElement.SelectSingleNode("/umbPackage/info/package/requirements/patch").FirstChild.Value); var reqNode = Config.DocumentElement.SelectSingleNode("/umbPackage/info/package/requirements"); - RequirementsType = reqNode != null && reqNode.Attributes != null && reqNode.Attributes["type"] != null - ? Enum.Parse(reqNode.Attributes["type"].Value, true) + RequirementsType = reqNode != null && reqNode.Attributes != null && reqNode.Attributes["type"] != null + ? Enum.Parse(reqNode.Attributes["type"].Value, true) : RequirementsType.Legacy; var iconNode = Config.DocumentElement.SelectSingleNode("/umbPackage/info/package/iconUrl"); if (iconNode != null && iconNode.FirstChild != null) { IconUrl = iconNode.FirstChild.Value; } - + Author = Config.DocumentElement.SelectSingleNode("/umbPackage/info/author/name").FirstChild.Value; AuthorUrl = Config.DocumentElement.SelectSingleNode("/umbPackage/info/author/website").FirstChild.Value; @@ -630,7 +663,7 @@ namespace umbraco.cms.businesslogic.packager Control = XmlHelper.GetNodeValue(controlNode); } } - + /// /// This uses the old method of fetching and only supports the packages.umbraco.org repository. /// @@ -760,7 +793,7 @@ namespace umbraco.cms.businesslogic.packager { File.Delete(zipName); } - + return tempDir; From 1f313b948790c70ee89e40d8ef250a25489857bc Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Fri, 2 Sep 2016 11:39:16 +0200 Subject: [PATCH 03/20] Added support for progress bar/list for when uploading a single file --- .../src/views/components/upload/umb-file-dropzone.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html index 60cec9996f..6a05d234f0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/upload/umb-file-dropzone.html @@ -36,7 +36,7 @@ -
    +
    • From fca865a743005357c53f37e8d4a98b08b61e154a Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Fri, 2 Sep 2016 14:33:07 +0200 Subject: [PATCH 04/20] Fixed Redirects UI.. Added flex-box basis utility, removed date and edit button --- .../src/less/components/umb-table.less | 2 +- .../src/less/utilities/_flexbox.less | 109 ++++++++++++++---- .../dashboard/developer/redirecturls.html | 26 ++--- 3 files changed, 95 insertions(+), 42 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index 219c15c7d5..73f81bcd73 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -243,7 +243,7 @@ input.umb-table__input { text-overflow: ellipsis; } -.umb-table-cell:first-of-type { +.umb-table-cell:first-of-type:not(.umb-table-cell.not-fixed) { flex: 0 0 25px; margin: 0 0 0 15px; diff --git a/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less b/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less index 829aba08f7..c0815fa8ac 100644 --- a/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less +++ b/src/Umbraco.Web.UI.Client/src/less/utilities/_flexbox.less @@ -1,37 +1,96 @@ /* + Flexbox + */ +.flex { display: flex; } +.flex-inline { display: inline-flex; } -.flex { display: flex } +.flex-column { flex-direction: column; } +.flex-wrap { flex-wrap: wrap; } -.flex-column { flex-direction: column } -.flex-wrap { flex-wrap: wrap } +.items-start { align-items: flex-start; } +.items-end { align-items: flex-end; } +.items-center { align-items: center; } +.items-baseline { align-items: baseline; } +.items-stretch { align-items: stretch; } -.items-start { align-items: flex-start } -.items-end { align-items: flex-end } -.items-center { align-items: center } -.items-baseline { align-items: baseline } -.items-stretch { align-items: stretch } +.self-start { align-self: flex-start; } +.self-end { align-self: flex-end; } +.self-center { align-self: center; } +.self-baseline { align-self: baseline; } +.self-stretch { align-self: stretch; } -.self-start { align-self: flex-start } -.self-end { align-self: flex-end } -.self-center { align-self: center } -.self-baseline { align-self: baseline } -.self-stretch { align-self: stretch } +.justify-start { justify-content: flex-start; } +.justify-end { justify-content: flex-end; } +.justify-center { justify-content: center; } +.justify-between { justify-content: space-between; } +.justify-around { justify-content: space-around; } -.justify-start { justify-content: flex-start } -.justify-end { justify-content: flex-end } -.justify-center { justify-content: center } -.justify-between { justify-content: space-between } -.justify-around { justify-content: space-around } +.content-start { align-content: flex-start; } +.content-end { align-content: flex-end; } +.content-center { align-content: center; } +.content-between { align-content: space-between; } +.content-around { align-content: space-around; } +.content-stretch { align-content: stretch; } -.content-start { align-content: flex-start } -.content-end { align-content: flex-end } -.content-center { align-content: center } -.content-between { align-content: space-between } -.content-around { align-content: space-around } -.content-stretch { align-content: stretch } +.flx-i { + flex: 1; +} + + +.flx-g0 { + flex-grow: 0; +} +.flx-g1 { + flex-grow: 1; +} + +.flx-s0 { + flex-shrink: 0; +} +.flx-s1 { + flex-shrink: 1; +} + + +.flx-b0 { + flex-basis: 0%; +} +.flx-b1 { + flex-basis: 10%; +} +.flx-b2 { + flex-basis: 20%; +} +.flx-b3 { + flex-basis: 30%; +} +.flx-b4 { + flex-basis: 40%; +} +.flx-b5 { + flex-basis: 50%; +} +.flx-b6 { + flex-basis: 60%; +} +.flx-b7 { + flex-basis: 70%; +} +.flx-b8 { + flex-basis: 80%; +} +.flx-b9 { + flex-basis: 90%; +} +.flx-b10 { + flex-basis: 100%; +} +.flx-ba { + flex-basis: auto; +} /* 1. Fix for Chrome 44 bug. https://code.google.com/p/chromium/issues/detail?id=506893 */ .flex-auto { @@ -40,4 +99,4 @@ min-height: 0; /* 1 */ } -.flex-none { flex: none } +.flex-none { flex: none; } diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html index 50c350da5f..db4f41fd11 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html @@ -53,11 +53,9 @@
      -
      -
      Original Url
      -
      Redirected To
      -
      Date Created
      -
      +
      Original Url
      +
      +
      Redirected To
      @@ -65,24 +63,20 @@
      -
      - -
      -
      +
      {{redirectUrl.originalUrl}}
      -
      - {{redirectUrl.destinationUrl}} +
      +
      -
      - {{redirectUrl.createDateUtc | date:'medium'}} -
      +
      +
      + {{redirectUrl.destinationUrl}} +
      -
      - Edit
      From 6cb5331918ad5906c826428ded4395a2c93aa0ea Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Fri, 2 Sep 2016 14:37:31 +0200 Subject: [PATCH 05/20] Fixed mistake where :not was applied to every umb-table-cell --- src/Umbraco.Web.UI.Client/src/less/components/umb-table.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less index 73f81bcd73..bc8e19cf2b 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-table.less @@ -243,7 +243,7 @@ input.umb-table__input { text-overflow: ellipsis; } -.umb-table-cell:first-of-type:not(.umb-table-cell.not-fixed) { +.umb-table-cell:first-of-type:not(.not-fixed) { flex: 0 0 25px; margin: 0 0 0 15px; From fa45cd1a8892a05ae91633688c944093d24d1670 Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 2 Sep 2016 14:42:35 +0200 Subject: [PATCH 06/20] tmp --- .../src/common/resources/redirecturls.resource.js | 6 +++--- .../views/dashboard/developer/redirecturls.controller.js | 8 +++++--- .../src/views/dashboard/developer/redirecturls.html | 2 +- src/Umbraco.Web.UI/config/Dashboard.Release.config | 2 +- src/Umbraco.Web.UI/config/Dashboard.config | 2 +- src/Umbraco.Web/Editors/BackOfficeController.cs | 2 +- .../Editors/RedirectUrlManagementController.cs | 6 ++++-- src/Umbraco.Web/Models/Mapping/DashboardModelsMapper.cs | 7 +++++-- src/Umbraco.Web/Routing/DefaultUrlProvider.cs | 6 +++++- src/Umbraco.Web/Routing/UrlProvider.cs | 9 +++++++++ src/Umbraco.Web/Umbraco.Web.csproj | 3 +++ 11 files changed, 38 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/redirecturls.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/redirecturls.resource.js index 80f6bc023e..ea40c066f0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/redirecturls.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/redirecturls.resource.js @@ -41,13 +41,13 @@ 'Failed to retrieve data for searching redirect urls'); } - function isEnabled() { + function getEnableState() { return umbRequestHelper.resourcePromise( $http.get( umbRequestHelper.getApiUrl( "redirectUrlManagementApiBaseUrl", - "IsEnabled")), + "GetEnableState")), 'Failed to retrieve data to check if the 301 redirect is enabled'); } @@ -107,7 +107,7 @@ searchRedirectUrls: searchRedirectUrls, deleteRedirectUrl: deleteRedirectUrl, toggleUrlTracker: toggleUrlTracker, - isEnabled: isEnabled + getEnableState: getEnableState }; return resource; diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js index 1b26a5dc76..9fdc432855 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js @@ -14,7 +14,8 @@ vm.dashboard = { searchTerm: "", loading: false, - urlTrackerDisabled: false + urlTrackerDisabled: false, + admin: false }; vm.pagination = { @@ -40,8 +41,9 @@ function checkEnabled() { vm.dashboard.loading = true; - return redirectUrlsResource.isEnabled().then(function (response) { - vm.dashboard.urlTrackerDisabled = response !== "true"; + return redirectUrlsResource.getEnableState().then(function (response) { + vm.dashboard.urlTrackerDisabled = response.enabled !== "true"; + vm.dashboard.admin = response.admin; vm.dashboard.loading = false; }); } diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html index db4f41fd11..260ae272d6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html @@ -6,7 +6,7 @@ - +
/// [HttpGet] - public bool IsEnabled() + public IHttpActionResult GetEnabledState() { - return UmbracoConfig.For.UmbracoSettings().WebRouting.DisableRedirectUrlTracking == false; + var enabled = UmbracoConfig.For.UmbracoSettings().WebRouting.DisableRedirectUrlTracking == false; + var admin = Umbraco.UmbracoContext.Security.CurrentUser.Id == 0; // fixme + return Ok(new { enabled, admin }); } //add paging diff --git a/src/Umbraco.Web/Models/Mapping/DashboardModelsMapper.cs b/src/Umbraco.Web/Models/Mapping/DashboardModelsMapper.cs index a87ea4eeb9..66510a2263 100644 --- a/src/Umbraco.Web/Models/Mapping/DashboardModelsMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/DashboardModelsMapper.cs @@ -1,9 +1,12 @@ -using AutoMapper; +using System; +using System.Linq; +using AutoMapper; using Umbraco.Core; using Umbraco.Core.Models.Mapping; using Umbraco.Web.Models.ContentEditing; using umbraco.BusinessLogic; using Umbraco.Core.Models; +using Umbraco.Web.Routing; namespace Umbraco.Web.Models.Mapping { @@ -15,7 +18,7 @@ namespace Umbraco.Web.Models.Mapping public override void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext) { config.CreateMap() - .ForMember(x => x.OriginalUrl, expression => expression.MapFrom(item => item.Url)) + .ForMember(x => x.OriginalUrl, expression => expression.MapFrom(item => UmbracoContext.Current.UrlProvider.GetUrlFromRoute(item.ContentId, item.Url))) .ForMember(x => x.DestinationUrl, expression => expression.Ignore()) .ForMember(x => x.RedirectId, expression => expression.MapFrom(item => item.Key)); diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs index 915636889d..d55095d151 100644 --- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs +++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs @@ -52,7 +52,11 @@ namespace Umbraco.Web.Routing // will not use cache if previewing var route = umbracoContext.ContentCache.GetRouteById(id); + return GetUrlFromRoute(route, umbracoContext, id, current, mode); + } + internal string GetUrlFromRoute(string route, UmbracoContext umbracoContext, int id, Uri current, UrlProviderMode mode) + { if (string.IsNullOrWhiteSpace(route)) { LogHelper.Debug( @@ -75,7 +79,7 @@ namespace Umbraco.Web.Routing // route is / or / var pos = route.IndexOf('/'); var path = pos == 0 ? route : route.Substring(pos); - var domainUri = pos == 0 + var domainUri = pos == 0 ? null : domainHelper.DomainForNode(int.Parse(route.Substring(0, pos)), current); diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs index 714ba64e64..2bb012d207 100644 --- a/src/Umbraco.Web/Routing/UrlProvider.cs +++ b/src/Umbraco.Web/Routing/UrlProvider.cs @@ -147,6 +147,15 @@ namespace Umbraco.Web.Routing return url ?? "#"; // legacy wants this } + internal string GetUrlFromRoute(int id, string route) + { + var provider = _urlProviders.OfType().FirstOrDefault(); + var url = provider == null + ? route // what else? + : provider.GetUrlFromRoute(route, UmbracoContext.Current, id, _umbracoContext.CleanedUmbracoUrl, Mode); + return url ?? "#"; + } + #endregion #region GetOtherUrls diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index b3c6c0c359..9360ad309e 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -209,6 +209,9 @@ False ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\Facades\System.Runtime.dll + From c05a28a901aae8cd0e8a2456c5ad4069f117c66a Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 2 Sep 2016 14:54:18 +0200 Subject: [PATCH 07/20] U4-8719 - bugfix the redirect dashboard, move to content section --- .../src/views/dashboard/developer/redirecturls.controller.js | 2 +- .../src/views/dashboard/developer/redirecturls.html | 2 +- src/Umbraco.Web/Editors/BackOfficeController.cs | 2 +- src/Umbraco.Web/Editors/RedirectUrlManagementController.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js index 9fdc432855..98e7ea6b1e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.controller.js @@ -42,7 +42,7 @@ function checkEnabled() { vm.dashboard.loading = true; return redirectUrlsResource.getEnableState().then(function (response) { - vm.dashboard.urlTrackerDisabled = response.enabled !== "true"; + vm.dashboard.urlTrackerDisabled = response.enabled !== true; vm.dashboard.admin = response.admin; vm.dashboard.loading = false; }); diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html index 260ae272d6..c885a77997 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html @@ -6,7 +6,7 @@ - + @@ -53,9 +53,9 @@
-
Original Url
+
Original URL
-
Redirected To
+
Redirected To
@@ -77,7 +77,7 @@ {{redirectUrl.destinationUrl}} - + @@ -89,8 +89,8 @@ -
No redirects have been made
- When a published page gets renamed a redirect will automatically be made to the new page +
No redirects have been made
+ When a published page gets renamed or moved a redirect will automatically be made to the new page %0%.]]> %0%.]]> + + Disable URL tracker + Enable URL tracker + Original URL + Redirected To + No redirects have been made + When a published page gets renamed or moved a redirect will automatically be made to the new page. + Remove + Are you sure you want to remove the redirect from '%0%' to '%1%'? + Redirect URL removed. + Error removing redirect URL. + Are you sure you want to disable the URL tracker? + URL tracker has now been disabled. + Error disabling the URL tracker, more information can be found in your log file. + URL tracker has now been enabled. + Error enabling the URL tracker, more information can be found in your log file. + 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 dd9931ed06..aeeb441281 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1420,4 +1420,21 @@ To manage your website, simply open the Umbraco back office and start adding con %0%.]]> %0%.]]> + + Disable URL tracker + Enable URL tracker + Original URL + Redirected To + No redirects have been made + When a published page gets renamed or moved a redirect will automatically be made to the new page. + Remove + Are you sure you want to remove the redirect from '%0%' to '%1%'? + Redirect URL removed. + Error removing redirect URL. + Are you sure you want to disable the URL tracker? + URL tracker has now been disabled. + Error disabling the URL tracker, more information can be found in your log file. + URL tracker has now been enabled. + Error enabling the URL tracker, more information can be found in your log file. + From 4186791d9ab9ec00f7048090296693d3349cc84b Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sun, 4 Sep 2016 13:13:45 +0200 Subject: [PATCH 16/20] Removing this reference for now, doesn't seem like the best way to reference a dll and the sln build fine without this --- src/Umbraco.Web/Umbraco.Web.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 9360ad309e..b3c6c0c359 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -209,9 +209,6 @@ False ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\Facades\System.Runtime.dll - From 0a43fea1c0134e5b9103f01e49b37c08fbf996ff Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 5 Sep 2016 14:42:45 +0200 Subject: [PATCH 17/20] U4-8939 Old openContentPicker() method is failing Adding jquery-migrate to make sure legacy applications keep working --- src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs b/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs index 621ecd214c..9bd6509ae7 100644 --- a/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs +++ b/src/Umbraco.Web/UI/Bundles/JsJQueryCore.cs @@ -8,6 +8,7 @@ namespace Umbraco.Web.UI.Bundles /// [ClientDependency(ClientDependencyType.Javascript, "ui/jquery.js", "UmbracoClient", Priority = 0, Group = 1)] [ClientDependency(ClientDependencyType.Javascript, "ui/jqueryui.js", "UmbracoClient", Priority = 1, Group = 1)] + [ClientDependency(ClientDependencyType.Javascript, "lib/jquery-migrate/jquery-migrate.min.js", "UmbracoRoot", Priority = 2, Group = 1)] public class JsJQueryCore : Control { } From 4a5314d8b9d2d906c8449093c5ebefa3d731ef95 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 5 Sep 2016 14:56:06 +0200 Subject: [PATCH 18/20] No longer need this now that it's part of JsJQueryCore --- .../umbraco.presentation/umbraco/users/PermissionEditor.aspx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx index c67837b5e6..815a420f88 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx @@ -9,7 +9,6 @@ - From 28b4945d361e8dc95fc621d204613cb7192813c6 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 5 Sep 2016 14:59:22 +0200 Subject: [PATCH 19/20] No longer need this now that it's part of JsJQueryCore --- src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx | 1 - .../umbraco/users/PermissionEditor.aspx.designer.cs | 9 --------- 2 files changed, 10 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx b/src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx index c67837b5e6..815a420f88 100644 --- a/src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx +++ b/src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx @@ -9,7 +9,6 @@ - diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.designer.cs index 639adc5569..e0c1494dd4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.designer.cs @@ -39,15 +39,6 @@ namespace umbraco.cms.presentation.user { /// protected global::ClientDependency.Core.Controls.JsInclude JsInclude1; - /// - /// JsInclude2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ClientDependency.Core.Controls.JsInclude JsInclude2; - /// /// pnlUmbraco control. /// From 893c2a99bee5a80b7dc2c804d442bf5387545009 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 8 Sep 2016 09:30:13 +0200 Subject: [PATCH 20/20] adds some comments --- .../Identity/AuthenticationOptionsExtensions.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Security/Identity/AuthenticationOptionsExtensions.cs b/src/Umbraco.Web/Security/Identity/AuthenticationOptionsExtensions.cs index 7074a6db9f..76c06fbac2 100644 --- a/src/Umbraco.Web/Security/Identity/AuthenticationOptionsExtensions.cs +++ b/src/Umbraco.Web/Security/Identity/AuthenticationOptionsExtensions.cs @@ -8,7 +8,16 @@ namespace Umbraco.Web.Security.Identity { public static class AuthenticationOptionsExtensions { - + + /// + /// When trying to implement an Azure AD B2C provider or other OAuth provider that requires a customized Challenge Result in order to work then + /// this must be used. + /// + /// + /// + /// + /// See: http://issues.umbraco.org/issue/U4-7353 + /// public static void SetSignInChallengeResultCallback( this AuthenticationOptions authOptions, Func authProperties)