diff --git a/UpgradeReadme.txt b/UpgradeReadme.txt index a765191522..fff889ef2e 100644 --- a/UpgradeReadme.txt +++ b/UpgradeReadme.txt @@ -22,7 +22,7 @@ to use the UmbracoClientPath setting * All references to the old Client Dependency libraries have been removed completely. -* Moved treeIcons.css to ~/umbraco_client/Tree/treeIcons.css +* Moved treeIcons.css to ~/[UmbracoClientFolder]/Tree/treeIcons.css * Removed all IFormHandler dependencies and therefore removed the idea of FormHandlers all together: - IFormHandler diff --git a/components/editorControls/umbraco.editorControls.csproj b/components/editorControls/umbraco.editorControls.csproj index 831a0332fa..9d8a873412 100644 --- a/components/editorControls/umbraco.editorControls.csproj +++ b/components/editorControls/umbraco.editorControls.csproj @@ -1,7 +1,7 @@  Local - 9.0.21022 + 9.0.30729 2.0 {255F5DF1-4E43-4758-AC05-7A0B68EB021B} Debug diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx index 82dc91b489..e75dd8ef84 100644 --- a/umbraco/presentation/install/default.aspx +++ b/umbraco/presentation/install/default.aspx @@ -1,7 +1,7 @@ <%@ Page Language="c#" CodeBehind="default.aspx.cs" AutoEventWireup="True" Inherits="umbraco.presentation.install._default" EnableViewState="False" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %> +<%@ Register TagPrefix="ctl" Src="../umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %> diff --git a/umbraco/presentation/install/default.aspx.designer.cs b/umbraco/presentation/install/default.aspx.designer.cs index 4a7bd00d30..422fc0da6f 100644 --- a/umbraco/presentation/install/default.aspx.designer.cs +++ b/umbraco/presentation/install/default.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/create/xslt.ascx.cs b/umbraco/presentation/umbraco/create/xslt.ascx.cs index 4e63a77c67..37a9653b9d 100644 --- a/umbraco/presentation/umbraco/create/xslt.ascx.cs +++ b/umbraco/presentation/umbraco/create/xslt.ascx.cs @@ -69,7 +69,7 @@ namespace umbraco.presentation.create .ChildNodeCreated() .CloseModalWindow(); - //Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "refresh", ""); + } diff --git a/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx b/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx index 9615a7387a..3cc6ef3f91 100644 --- a/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx +++ b/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx @@ -2,6 +2,9 @@ Inherits="umbraco.developer.assemblyBrowser" %> <%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="umbraco" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> +<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> + +

@@ -24,9 +27,7 @@

- + diff --git a/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs b/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs index 3dc6dee7ed..f2378a23eb 100644 --- a/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs +++ b/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3053 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx index 5f29842b37..cfe131ec3e 100644 --- a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx +++ b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx @@ -1,7 +1,7 @@ <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Install boost" CodeBehind="Boost.aspx.cs" Inherits="umbraco.presentation.developer.packages.Boost" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> -<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %> +<%@ Register TagPrefix="ctl" Src="../../controls/ProgressBar.ascx" TagName="ProgBar" %> diff --git a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs index 24db5f6767..9030587891 100644 --- a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs +++ b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx b/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx index 1c566449ce..8322e922d2 100644 --- a/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx +++ b/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx @@ -1,6 +1,6 @@ <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="installedPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.installedPackage" %> <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %> -<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar" %> +<%@ Register TagPrefix="ctl" Src="../../controls/ProgressBar.ascx" TagName="ProgBar" %>