yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp-U4-8802' of https://github.com/umbraco/Umbraco-CMS into temp-U4-8802

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html
#	src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
This commit is contained in:
Shannon
2016-08-08 14:42:07 +02:00
parent c331ba134a 69c952ddda
commit 4301af108f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/views/dashboard/developer/redirecturls.html
View File

@@ -63,11 +63,11 @@
</div>
<div class="umb-table-cell">
<a class="umb-table-body__link" href="{{redirectUrl.originalUrl}}" title="{{redirectUrl.originalUrl}}">{{redirectUrl.originalUrl}}</a>
<a class="umb-table-body__link" href="{{redirectUrl.originalUrl}}" target="_blank" title="{{redirectUrl.originalUrl}}">{{redirectUrl.originalUrl}}</a>
</div>
<div class="umb-table-cell">
<a class="umb-table-body__link" href="{{redirectUrl.destinationUrl}}" title="{{redirectUrl.destinationUrl}}">{{redirectUrl.destinationUrl}}</a>
<a class="umb-table-body__link" href="{{redirectUrl.destinationUrl}}" target="_blank" title="{{redirectUrl.destinationUrl}}">{{redirectUrl.destinationUrl}}</a>
</div>
<div class="umb-table-cell">

1
src/Umbraco.Web/Editors/RedirectUrlManagementController.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Web.Hosting;
using System.Web.Http;
using System.Xml;
using System.Collections.Generic;