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

Merge with 4.11.5

Browse Source
This commit is contained in:
Shannon Deminick
2013-02-22 20:00:10 +06:00
parent 596c4ac329 7a47d63b48
commit e2d806f5d9
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Tests/Masterpages/dummy.txt Normal file
View File

@@ -0,0 +1 @@
This file is just here to make sure the directory gets created.

1
src/Umbraco.Tests/Views/dummy.txt Normal file
View File

@@ -0,0 +1 @@
This file is just here to make sure the directory gets created.

3
src/Umbraco.Web.UI/packages.config
View File

@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ClientDependency" version="1.5.1.0" targetFramework="net40" />
<package id="Examine" version="0.1.47.2941" targetFramework="net40" />
<package id="ClientDependency-Mvc" version="1.5.1.0" targetFramework="net40" />
<package id="log4net-mediumtrust" version="2.0.0" targetFramework="net40" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net40" />
@@ -10,6 +12,7 @@
<package id="Microsoft.Web.Helpers" version="1.0.0" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="MySql.Data" version="6.6.4" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
<package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
<package id="uGoLive" version="1.4.0" targetFramework="net40" />
<package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />

2
src/umbraco.editorControls/tinymce/tinyMCEImageHelper.cs
View File

@@ -136,7 +136,7 @@ namespace umbraco.editorControls.tinymce
var uf = new UmbracoFile(orgPath);
newSrc = uf.Resize(newWidth, newHeight);
}
}
}
finalWidth = newWidth;
finalHeight = newHeight;