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

WORK IN PROGRESS, GET STABLE SOURCE FROM DOWNLOAD TAB

Browse Source 
wrong drl dialog file, turns off examine, adds missing dll for microsoft scripting

[TFS Changeset #64068]
This commit is contained in:
PerPloug
2010-02-18 21:00:58 +00:00
parent aa28e473b6
commit d961dc9b50
8 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
foreign dlls/Microsoft.Scripting.ExtensionAttribute.dll Normal file
View File

Binary file not shown.

2
umbraco.sln
View File

@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
foreign dlls\Microsoft.ApplicationBlocks.Data.dll = foreign dlls\Microsoft.ApplicationBlocks.Data.dll
foreign dlls\Microsoft.Scripting.Core.dll = foreign dlls\Microsoft.Scripting.Core.dll
foreign dlls\Microsoft.Scripting.dll = foreign dlls\Microsoft.Scripting.dll
foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll = foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll
foreign dlls\MySql.Data.dll = foreign dlls\MySql.Data.dll
foreign dlls\System.Web.Abstractions.dll = foreign dlls\System.Web.Abstractions.dll
foreign dlls\System.Web.Abstractions.xml = foreign dlls\System.Web.Abstractions.xml
@@ -24,7 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
umbraco.build = umbraco.build
foreign dlls\umbraco.Linq.DTMetal.Engine.dll = foreign dlls\umbraco.Linq.DTMetal.Engine.dll
foreign dlls\UrlRewritingNet.UrlRewriter.dll = foreign dlls\UrlRewritingNet.UrlRewriter.dll
foreign dlls\VistaDB For Umbraco.dll = foreign dlls\VistaDB For Umbraco.dll
foreign dlls\VistaDB.NET20.dll = foreign dlls\VistaDB.NET20.dll
EndProjectSection
EndProject

2
umbraco/cms/umbraco.cms.csproj
View File

@@ -83,7 +83,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\foreign dlls\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\foreign dlls\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>

2
umbraco/presentation/config/ExamineSettings.config
View File

@@ -8,7 +8,7 @@ More information and documentation can be found on CodePlex: http://umbracoexami
-->
<UmbracoExamine>
<!-- Disabled for the beta since new xml schema is not supported -->
<ExamineIndexProviders enableDefaultEventHandler="true">
<ExamineIndexProviders enableDefaultEventHandler="false">
<providers>
<add name="InternalIndex" type="UmbracoExamine.Providers.LuceneExamineIndexer, UmbracoExamine.Providers"
indexSet="Default"

4
umbraco/presentation/umbraco.presentation.csproj
View File

@@ -113,6 +113,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\foreign dlls\Microsoft.Scripting.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting.ExtensionAttribute, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\foreign dlls\Microsoft.Scripting.ExtensionAttribute.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>

2
umbraco/presentation/umbraco/create/standardTasks.cs
View File

@@ -222,7 +222,7 @@ namespace umbraco
{
cms.businesslogic.macro.Macro m = cms.businesslogic.macro.Macro.MakeNew(
helper.SpaceCamelCasing(fileName.Substring(0, (fileName.LastIndexOf('.') + 1)).Trim('.')));
m.ScriptingFile = _alias;
m.ScriptingFile = fileName;
}
m_returnUrl = string.Format(SystemDirectories.Umbraco + "/developer/python/editPython.aspx?file={0}", fileName);

2
umbraco/presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
View File

@@ -34,7 +34,7 @@ namespace umbraco.presentation.developer.packages {
if (!string.IsNullOrEmpty(category))
category = "&category=" + category;
iframeGen.Text = "<iframe id=\"repoFrame\" frameborder=\"1\" style=\"border: none; display: block\" src=\"" + url + "?repoGuid=" + repoGuid + category + "&callback=" + Request.ServerVariables["SERVER_NAME"] + ":" + Request.ServerVariables["SERVER_PORT"] + IOHelper.ResolveUrl( SystemDirectories.Umbraco ) + "/developer/packages/proxy.htm?/" + IOHelper.ResolveUrl(SystemDirectories.Umbraco).Trim('/') + "/developer/packages/installer.aspx?repoGuid=" + repoGuid + "&version=v31\"></iframe>";
iframeGen.Text = "<iframe id=\"repoFrame\" frameborder=\"1\" style=\"border: none; display: block\" src=\"" + url + "?repoGuid=" + repoGuid + category + "&callback=" + Request.ServerVariables["SERVER_NAME"] + ":" + Request.ServerVariables["SERVER_PORT"] + IOHelper.ResolveUrl( SystemDirectories.Umbraco ) + "/developer/packages/proxy.htm?/" + IOHelper.ResolveUrl(SystemDirectories.Umbraco).Trim('/') + "/developer/packages/installer.aspx?repoGuid=" + repoGuid + "&version=v31&useLegacySchema=" + UmbracoSettings.UseLegacyXmlSchema.ToString() + "\"></iframe>";
}
#region Web Form Designer generated code

2
umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js
View File

@@ -257,7 +257,7 @@ Umbraco.Application.Actions = function() {
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380);
}
else if (actionNode.nodeType == "initpython" || actionNode.nodeType == "initdlrscripting") {
UmbClientMgr.mainWindow().openModal("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], 380, 420);
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380);
}
else {
UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 270);