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

WORK IN PROGRESS GET THE STABLE SOURCE FROM THE DOWNLOADS TAB

Browse Source 
Beta 2 checkin, *high fives*

[TFS Changeset #64074]
This commit is contained in:
PerPloug
2010-02-19 00:18:04 +00:00
parent ce889a698d
commit 84cfe5e4d9
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
umbraco/businesslogic/GlobalSettings.cs
View File

@@ -16,7 +16,7 @@ namespace umbraco
{
#region Private static fields
// CURRENT UMBRACO VERSION ID
private static string _currentVersion = "4.1.0.beta";
private static string _currentVersion = "4.1.0.betaII";
private static string _reservedUrlsCache;
private static string _reservedPathsCache;

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

@@ -8,11 +8,11 @@ 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="false">
<ExamineIndexProviders enableDefaultEventHandler="true">
<providers>
<add name="InternalIndex" type="UmbracoExamine.Providers.LuceneExamineIndexer, UmbracoExamine.Providers"
indexSet="Default"
enabled="false"
enabled="true"
debug="false"
supportUnpublished="true"/>
<!-- This is an example of an index provider created for the Creative Website Starter kit

4
umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
View File

@@ -10,7 +10,7 @@
<h3 style="padding: 0px; margin: 0px;">
<asp:ImageButton ID="DeleteButton2" Runat="server"></asp:ImageButton>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%=umbraco.IO.SystemDirectories.Umbraco%>/images/expand.png" style="FLOAT: right"/>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
<asp:Literal ID="FullHeader" Runat="server"></asp:Literal>
</a>
@@ -21,7 +21,7 @@
<h3 style="padding: 0px; margin: 0px;">
<asp:ImageButton ID="DeleteButton" Runat="server"></asp:ImageButton>
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%=umbraco.IO.SystemDirectories.Umbraco%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right">
<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right" />
Edit "<asp:Literal ID="Header" Runat="server"></asp:Literal>"</a>
</h3>

2
umbraco/presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.designer.cs generated
View File

@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4200
// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

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

@@ -12,8 +12,7 @@ namespace umbraco
/// <summary>
/// Summary description for standardTasks.
/// </summary>
///
///
public class XsltTasks : interfaces.ITaskReturnUrl
{