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

Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

Browse Source 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
This commit is contained in:
Shannon
2013-10-09 11:12:33 +11:00
parent 38761e1413 16bce4248d
commit d281f97659
58 changed files with 1152 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/install/default.aspx
View File

@@ -2,9 +2,7 @@
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register Src="~/install/Title.ascx" TagPrefix="umb1" TagName="PageTitle" %>
<!DOCTYPE html>
<%@ Register Src="~/install/Title.ascx" TagPrefix="umb1" TagName="PageTitle" %><!DOCTYPE html>
<html>
<head runat="server">

2
src/Umbraco.Web.UI/install/steps/database.ascx
View File

@@ -201,7 +201,7 @@
<div class="step">
<div class="container">
<p>
<strong>2. Connection details:</strong> Please fill out the connection information for your database.</strong>
<strong>2. Connection details:</strong> Please fill out the connection information for your database.
</p>
<div class="instruction-hold">