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

Merge

Browse Source
This commit is contained in:
starfighter83
2011-01-12 14:05:12 -01:00
parent f0883b0994 8e4deca486
commit 96f2ded0aa
4 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs
View File

@@ -449,7 +449,7 @@ namespace umbraco.editorControls.tinyMCE3.webcontrol
Regex.Matches(content, pattern, RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
// Page for macro rendering
//page p = new page(nodeId, versionId);
// page p = new page(nodeId, versionId);
System.Web.HttpContext.Current.Items["macrosAdded"] = 0;
System.Web.HttpContext.Current.Items["pageID"] = nodeId.ToString();

35
default.build
View File

@@ -20,6 +20,8 @@
<property name="build.version" value="4.6.1"/>
<property name="build.configuration" value="Release"/>
<property name="docs.dir" value="${root.dir}\docs" />
<property name="win.dir" value="c:\WINDOWS" />
@@ -69,6 +71,7 @@
<arg value="/v:n" />
<arg value="/p:WarningLevel=0" />
<arg value="/p:ToolsVersion=4.0" />
<arg value="/p:Configuration=${build.configuration}" />
</exec>
<exec program="${win.dir}\microsoft.net\framework\v4.0.30319\aspnet_compiler.exe" commandline="-f -u -p umbraco/presentation -v / &quot;${build.dir}&quot;"/>
@@ -77,6 +80,7 @@
<arg value="/v:n" />
<arg value="/p:WarningLevel=0" />
<arg value="/p:ToolsVersion=4.0" />
<arg value="/p:Configuration=${build.configuration}" />
</exec>
</target>
@@ -131,12 +135,13 @@
<!-- 4.6 Files -->
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\Debug\umbraco.MacroEngines.dll" tofile="${build.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\Debug\umbraco.MacroEngines.pdb" tofile="${build.dir}\bin\umbraco.MacroEngines.pdb" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.dll" tofile="${build.dir}\bin\umbraco.MacroEngines.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\umbraco.MacroEngines.Juno\bin\${build.configuration}\umbraco.MacroEngines.pdb" tofile="${build.dir}\bin\umbraco.MacroEngines.pdb" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\foreign dlls\System.Web.Razor.dll" tofile="${build.dir}\bin\System.Web.Razor.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\foreign dlls\RazorEngine.Core.dll" tofile="${build.dir}\bin\RazorEngine.Core.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\foreign dlls\RazorEngine.Templates.dll" tofile="${build.dir}\bin\RazorEngine.Templates.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\foreign dlls\System.Web.Razor.dll" tofile="${build.dir}\bin\System.Web.Razor.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\foreign dlls\RazorEngine.Core.dll" tofile="${build.dir}\bin\RazorEngine.Core.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\foreign dlls\RazorEngine.Templates.dll" tofile="${build.dir}\bin\RazorEngine.Templates.dll" failonerror="false" overwrite="true"/>
<!--standard /data/packages files-->
<mkdir dir="${build.dir}\App_Data" />
@@ -144,7 +149,7 @@
<copy file="${root.dir}\config templates\packages\createdPackages.config" tofile="${build.dir}\app_data\packages\created\createdPackages.config" failonerror="false" overwrite="true"/>
<!-- Standard access.xml file-->
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\app_data\access.xml" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\config templates\access.xml" tofile="${build.dir}\app_data\access.config" failonerror="false" overwrite="true"/>
<!-- Standard create UI.xml-->
<copy file="${root.dir}\config templates\config\UI.xml" tofile="${build.dir}\umbraco\config\create\UI.xml" failonerror="false" overwrite="true"/>
@@ -156,8 +161,8 @@
<copy file="${build.dir}\umbraco\config\lang\en.xml" tofile="${web.dir}\usercontrols\translation\langs\en.xml" failonerror="false" overwrite="true"/>
<!-- LINQ2UMB dll-->
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\Debug - Fixed Version\umbraco.Linq.Core.dll" tofile="${build.dir}\bin\umbraco.Linq.Core.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\${build.configuration}\umbraco.Linq.Core.dll" tofile="${build.dir}\bin\umbraco.Linq.Core.dll" failonerror="false" overwrite="true"/>
<copy file="${root.dir}\LinqToUmbraco\src\umbraco.Linq\Core\bin\${build.configuration}\umbraco.Linq.Core.pdb" tofile="${build.dir}\bin\umbraco.Linq.Core.pdb" failonerror="false" overwrite="true"/>
<delete dir="${build.dir}\webservices" />
<delete dir="${build.dir}\umbracoBase" />
@@ -172,7 +177,6 @@
<delete dir="${build.dir}\xslt" />
<delete dir="${build.dir}\usercontrols" />
<delete>
<fileset>
<include name="${build.dir}/**/*.build" />
@@ -184,9 +188,8 @@
<include name="${build.dir}/**/*.resx" />
<include name="${build.dir}/**/*.user" />
<include name="${build.dir}/**/*.bak" />
<include name="${build.dir}/**/*.pdb" />
<include name="${build.dir}/**/*.orig" />
<include name="${build.dir}/**/*.orig" />
<include name="${build.dir}/PrecompiledApp.config" />
<include name="${build.dir}/web.config.template" />
@@ -196,6 +199,14 @@
</fileset>
</delete>
<if test="${build.configuration=='Release'}">
<delete>
<fileset>
<include name="${build.dir}/**/*.pdb" />
<include name="${build.dir}/bin/*.xml" />
</fileset>
</delete>
</if>
<!-- standard folders -->
<mkdir dir="${build.dir}\App_Code" />

1
umbraco.sln
View File

@@ -167,7 +167,6 @@ Global
{27A2590E-1313-4A33-89FD-92811540B69C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6277C9FB-3A9A-4537-AA86-82DA9B2527FD}.Release|Any CPU.Build.0 = Release|Any CPU
{5BA5425F-27A7-4677-865E-82246498AA2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5BA5425F-27A7-4677-865E-82246498AA2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5BA5425F-27A7-4677-865E-82246498AA2E}.Release|Any CPU.ActiveCfg = Release|Any CPU

2
umbraco/businesslogic/GlobalSettings.cs
View File

@@ -18,7 +18,7 @@ namespace umbraco
{
#region Private static fields
// CURRENT UMBRACO VERSION ID
private static string _currentVersion = "4.6.0";
private static string _currentVersion = "4.6.1";
private static string _reservedUrlsCache;
private static string _reservedPathsCache;