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-02-28 11:18:39 -01:00
parent ff802ebef4 ff678dd856
commit 25dfb4a2da
9 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
config templates/web.config
View File

@@ -178,19 +178,23 @@
<system.webServer>
<validation validateIntegratedModeConfiguration="false" />
<modules runAllManagedModulesForAllRequests="true">
<remove name="ScriptModule" />
<remove name="UrlRewriteModule" />
<remove name="umbracoRequestModule" />
<remove name="viewstateMoverModule" />
<remove name="umbracoBaseRequestModule" />
<remove name="ClientDependencyModule" />
<remove name="ScriptModule" />
<remove name="UrlRewriteModule" />
<remove name="umbracoRequestModule" />
<remove name="viewstateMoverModule" />
<remove name="umbracoBaseRequestModule" />
<remove name="ClientDependencyModule" />
<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
<remove name="FormsAuthentication" />
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule"/>
</modules>
<handlers accessPolicy="Read, Write, Script, Execute">

12
default.build
View File

@@ -24,7 +24,7 @@
<property name="WebPiAssets.dir" value="${root.dir}\config templates\WebPi" />
<property name="build.version" value="4.6.2 Beta"/>
<property name="build.version" value="4.7 RC"/>
<property name="build.configuration" value="Release"/>
@@ -129,14 +129,20 @@
<!-- setup symbol files -->
<mkdir dir="${build.symbolFiles.dir}" />
<copy todir="${build.symbolFiles.dir}">
<copy todir="${build.symbolFiles.dir}" flatten="true">
<fileset basedir="${build.dir}\bin">
<include name="*.xml" />
<include name="*.pdb" />
</fileset>
</copy>
<copy todir="${build.symbolFiles.dir}">
<copy todir="${build.symbolFiles.dir}" flatten="true">
<fileset basedir="${root.dir}\umbraco" >
<include name="**/*.pdb" />
</fileset>
</copy>
<copy todir="${build.symbolFiles.dir}" flatten="true">
<fileset basedir="${docs.dir}">
<include name="*.xml" />
</fileset>

1
umbraco.sln
View File

@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StandardConfig", "StandardC
config templates\umbraco.config = config templates\umbraco.config
config templates\config\umbracoSettings.config = config templates\config\umbracoSettings.config
config templates\config\UrlRewriting.config = config templates\config\UrlRewriting.config
config templates\web.config = config templates\web.config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{5BB61485-B480-4A03-A8DD-1636A5AF575C}"

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.7.0.beta";
private static string _currentVersion = "4.7.0.RC";
private static string _reservedUrlsCache;
private static string _reservedPathsCache;

2
umbraco/presentation/umbraco/scripting/templates/cshtml/Breadcrumb-DynamicNode.cshtml
View File

@@ -3,7 +3,7 @@
<em>DynamicNode:</em><br/>
<ul>
@foreach(var level in @Model.Ancestors.Where("ShouldBeVisible"))
@foreach(var level in @Model.Ancestors.Where("umbracoNaviHide != true"))
{
<li><a href="@level.Url">@level.Name</a></li>
}

2
umbraco/presentation/umbraco/scripting/templates/cshtml/ListSubPagesByDateAndLimit-DynamicNode.cshtml
View File

@@ -2,7 +2,7 @@
@{ var numberOfItems = 10; }
<ul>
@foreach (var item in @Model.Children.Where("ShouldBeVisible").Take(numberOfItems).OrderBy("UpdateDate")) {
@foreach (var item in @Model.Children.Where("umbracoNaviHide != true").Take(numberOfItems).OrderBy("UpdateDate")) {
<li><a href="@item.Url">@item.Name</a></li>
}
</ul>

6
umbraco/presentation/umbraco/scripting/templates/cshtml/SelectChildrenByDocumentType-DynamicNode.cshtml
View File

@@ -1,7 +1,7 @@
<em>DynamicNode:</em>
<ul>
@foreach (var item in @Model.ChildItem.Where("ShouldBeVisible"))
{
<li><a href="@item.Url">@item.Name</a></li>
@foreach (var item in @Model.ChildItem.Where("umbracoNaviHide != true"))
{
<li><a href="@item.Url">@item.Name</a></li>
}
</ul>

2
umbraco/presentation/umbraco/scripting/templates/cshtml/SiteMap-DynamicNode.cshtml
View File

@@ -7,7 +7,7 @@ var maxLevelForSitemap = 4;
var values = new Dictionary<string,object>();
values.Add("maxLevelForSitemap", maxLevelForSitemap) ;
var items = node.Children.Where("ShouldBeVisible == true && Level <= maxLevelForSitemap", values);
var items = node.Children.Where("umbracoNaviHide != true && Level <= maxLevelForSitemap", values);
<ul>
@foreach (var item in items) {
<li><a href="@item.Url">@item.Name</a>

6
umbraco/presentation/web.STANDARD.config
View File

@@ -193,13 +193,17 @@
<remove name="viewstateMoverModule" />
<remove name="umbracoBaseRequestModule" />
<remove name="ClientDependencyModule" />
<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
<remove name="FormsAuthentication" />
<add name="UrlRewriteModule" type="UrlRewritingNet.Web.UrlRewriteModule, UrlRewritingNet.UrlRewriter" />
<add name="umbracoRequestModule" type="umbraco.presentation.requestModule" />
<add name="viewstateMoverModule" type="umbraco.presentation.viewstateMoverModule" />
<add name="umbracoBaseRequestModule" type="umbraco.presentation.umbracobase.requestModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core"/>
<!-- Needed for login/membership to work on homepage (as per http://stackoverflow.com/questions/218057/httpcontext-current-session-is-null-when-routing-requests) -->
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule"/>
</modules>
<handlers accessPolicy="Read, Write, Script, Execute">