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

Merge branch origin/dev-v7 into dev-v7-deploy

Browse Source
This commit is contained in:
Stephan
2016-09-08 16:58:57 +02:00
parent be3032192a 893c2a99be
commit 22a62421f0
30 changed files with 480 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/config/Dashboard.Release.config
View File

@@ -104,7 +104,7 @@
</section>
<section alias="RedirectUrlManagement">
<areas>
<area>developer</area>
<area>content</area>
</areas>
<tab caption="Redirect URL Management">
<control>

2
src/Umbraco.Web.UI/config/Dashboard.config
View File

@@ -111,7 +111,7 @@
</section>
<section alias="RedirectUrlManagement">
<areas>
<area>developer</area>
<area>content</area>
</areas>
<tab caption="Redirect URL Management">
<control>

17
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -1416,4 +1416,21 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
<key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
</area>
<area alias="redirectUrls">
<key alias="disableUrlTracker">Disable URL tracker</key>
<key alias="enableUrlTracker">Enable URL tracker</key>
<key alias="originalUrl">Original URL</key>
<key alias="redirectedTo">Redirected To</key>
<key alias="noRedirects">No redirects have been made</key>
<key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
<key alias="removeButton">Remove</key>
<key alias="confirmRemove">Are you sure you want to remove the redirect from '%0%' to '%1%'?</key>
<key alias="redirectRemoved">Redirect URL removed.</key>
<key alias="redirectRemoveError">Error removing redirect URL.</key>
<key alias="confirmDisable">Are you sure you want to disable the URL tracker?</key>
<key alias="disabledConfirm">URL tracker has now been disabled.</key>
<key alias="disableError">Error disabling the URL tracker, more information can be found in your log file.</key>
<key alias="enabledConfirm">URL tracker has now been enabled.</key>
<key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
</area>
</language>

17
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -1420,4 +1420,21 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="notificationEmailsCheckSuccessMessage"><![CDATA[Notification email has been set to <strong>%0%</strong>.]]></key>
<key alias="notificationEmailsCheckErrorMessage"><![CDATA[Notification email is still set to the default value of <strong>%0%</strong>.]]></key>
</area>
<area alias="redirectUrls">
<key alias="disableUrlTracker">Disable URL tracker</key>
<key alias="enableUrlTracker">Enable URL tracker</key>
<key alias="originalUrl">Original URL</key>
<key alias="redirectedTo">Redirected To</key>
<key alias="noRedirects">No redirects have been made</key>
<key alias="noRedirectsDescription">When a published page gets renamed or moved a redirect will automatically be made to the new page.</key>
<key alias="removeButton">Remove</key>
<key alias="confirmRemove">Are you sure you want to remove the redirect from '%0%' to '%1%'?</key>
<key alias="redirectRemoved">Redirect URL removed.</key>
<key alias="redirectRemoveError">Error removing redirect URL.</key>
<key alias="confirmDisable">Are you sure you want to disable the URL tracker?</key>
<key alias="disabledConfirm">URL tracker has now been disabled.</key>
<key alias="disableError">Error disabling the URL tracker, more information can be found in your log file.</key>
<key alias="enabledConfirm">URL tracker has now been enabled.</key>
<key alias="enableError">Error enabling the URL tracker, more information can be found in your log file.</key>
</area>
</language>

1
src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
View File

@@ -9,7 +9,6 @@
<umb:CssInclude ID="CssInclude2" runat="server" FilePath="css/permissionsEditor.css" PathNameAlias="UmbracoRoot" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="PermissionsEditor.js" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="../lib/jquery-migrate/jquery-migrate.min.js" />
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">