diff --git a/lib/SQLCE4/System.Data.SqlServerCe.Entity.dll b/lib/SQLCE4/System.Data.SqlServerCe.Entity.dll index 8142f0c105..3d7692a0b9 100644 Binary files a/lib/SQLCE4/System.Data.SqlServerCe.Entity.dll and b/lib/SQLCE4/System.Data.SqlServerCe.Entity.dll differ diff --git a/lib/SQLCE4/System.Data.SqlServerCe.dll b/lib/SQLCE4/System.Data.SqlServerCe.dll index 376bdacf9f..acf228b726 100644 Binary files a/lib/SQLCE4/System.Data.SqlServerCe.dll and b/lib/SQLCE4/System.Data.SqlServerCe.dll differ diff --git a/lib/SQLCE4/amd64/sqlceca40.dll b/lib/SQLCE4/amd64/sqlceca40.dll index aa6b2e0ed2..d5d4c20448 100644 Binary files a/lib/SQLCE4/amd64/sqlceca40.dll and b/lib/SQLCE4/amd64/sqlceca40.dll differ diff --git a/lib/SQLCE4/amd64/sqlcecompact40.dll b/lib/SQLCE4/amd64/sqlcecompact40.dll index 263e458f23..ed061adee6 100644 Binary files a/lib/SQLCE4/amd64/sqlcecompact40.dll and b/lib/SQLCE4/amd64/sqlcecompact40.dll differ diff --git a/lib/SQLCE4/amd64/sqlceer40EN.dll b/lib/SQLCE4/amd64/sqlceer40EN.dll index 197f38eb06..e19eed9bda 100644 Binary files a/lib/SQLCE4/amd64/sqlceer40EN.dll and b/lib/SQLCE4/amd64/sqlceer40EN.dll differ diff --git a/lib/SQLCE4/amd64/sqlceme40.dll b/lib/SQLCE4/amd64/sqlceme40.dll index 8f42f181c4..c67fc9e6a5 100644 Binary files a/lib/SQLCE4/amd64/sqlceme40.dll and b/lib/SQLCE4/amd64/sqlceme40.dll differ diff --git a/lib/SQLCE4/amd64/sqlceqp40.dll b/lib/SQLCE4/amd64/sqlceqp40.dll index 899b080cbb..df4440332d 100644 Binary files a/lib/SQLCE4/amd64/sqlceqp40.dll and b/lib/SQLCE4/amd64/sqlceqp40.dll differ diff --git a/lib/SQLCE4/amd64/sqlcese40.dll b/lib/SQLCE4/amd64/sqlcese40.dll index fa39afa751..af2de5ec90 100644 Binary files a/lib/SQLCE4/amd64/sqlcese40.dll and b/lib/SQLCE4/amd64/sqlcese40.dll differ diff --git a/lib/SQLCE4/x86/sqlceca40.dll b/lib/SQLCE4/x86/sqlceca40.dll index 53d50a29f8..92596101eb 100644 Binary files a/lib/SQLCE4/x86/sqlceca40.dll and b/lib/SQLCE4/x86/sqlceca40.dll differ diff --git a/lib/SQLCE4/x86/sqlcecompact40.dll b/lib/SQLCE4/x86/sqlcecompact40.dll index 452a26e49e..41c69ecc51 100644 Binary files a/lib/SQLCE4/x86/sqlcecompact40.dll and b/lib/SQLCE4/x86/sqlcecompact40.dll differ diff --git a/lib/SQLCE4/x86/sqlceer40EN.dll b/lib/SQLCE4/x86/sqlceer40EN.dll index f8656b0a91..a40154fd37 100644 Binary files a/lib/SQLCE4/x86/sqlceer40EN.dll and b/lib/SQLCE4/x86/sqlceer40EN.dll differ diff --git a/lib/SQLCE4/x86/sqlceme40.dll b/lib/SQLCE4/x86/sqlceme40.dll index 6aeb1cb49b..d737119fa3 100644 Binary files a/lib/SQLCE4/x86/sqlceme40.dll and b/lib/SQLCE4/x86/sqlceme40.dll differ diff --git a/lib/SQLCE4/x86/sqlceqp40.dll b/lib/SQLCE4/x86/sqlceqp40.dll index d1498fa33b..dedfc9a3ce 100644 Binary files a/lib/SQLCE4/x86/sqlceqp40.dll and b/lib/SQLCE4/x86/sqlceqp40.dll differ diff --git a/lib/SQLCE4/x86/sqlcese40.dll b/lib/SQLCE4/x86/sqlcese40.dll index 731b01d797..cc37e3b549 100644 Binary files a/lib/SQLCE4/x86/sqlcese40.dll and b/lib/SQLCE4/x86/sqlcese40.dll differ diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 424e7b2f24..a91296c071 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Web; using System.Web.Configuration; using System.Xml; +using System.Xml.Linq; using Umbraco.Core.IO; using Umbraco.Core.Logging; @@ -197,13 +198,19 @@ namespace Umbraco.Core.Configuration vDir = v.PhysicalDirectory; } } - - var doc = new XmlDocument(); - doc.Load(String.Concat(vDir, "web.config")); - var root = doc.DocumentElement; - var setting = doc.SelectSingleNode(String.Concat("//appSettings/add[@key='", key, "']")); - setting.Attributes["value"].InnerText = value; - doc.Save(String.Concat(vDir, "web.config")); + + string fileName = String.Concat(vDir, "web.config"); + var xml = XDocument.Load(fileName); + var appSettings = xml.Root.Descendants("appSettings").Single(); + + // Update appSetting if it exists, or else create a new appSetting for the given key and value + var setting = appSettings.Descendants("add").Where(s => s.Attribute("key").Value == key).FirstOrDefault(); + if (setting == null) + appSettings.Add(new XElement("add", new XAttribute("key", key), new XAttribute("value", value))); + else + setting.Attribute("value").Value = value; + + xml.Save(fileName); ConfigurationManager.RefreshSection("appSettings"); } diff --git a/src/Umbraco.Web.UI/install/steps/database.ascx b/src/Umbraco.Web.UI/install/steps/database.ascx index 661b86726c..7812e9b16d 100644 --- a/src/Umbraco.Web.UI/install/steps/database.ascx +++ b/src/Umbraco.Web.UI/install/steps/database.ascx @@ -173,7 +173,7 @@

2. Getting a database setup for umbraco.
- For first time users, we recommend you select "quick-and-simple file-based database". + For first time users, we recommend you select "quick-and-simple embedded database". This will install an easy to use database, that does not require any additional software to use.
Alternatively, you can install Microsoft SQL Server, which will require a bit more diff --git a/src/Umbraco.Web.UI/install/steps/welcome.ascx b/src/Umbraco.Web.UI/install/steps/welcome.ascx index 6b8f29310a..09a6fe2413 100644 --- a/src/Umbraco.Web.UI/install/steps/welcome.ascx +++ b/src/Umbraco.Web.UI/install/steps/welcome.ascx @@ -34,7 +34,7 @@

As this is an upgrade, the wizard might skip steps that are only needed for new umbraco installations. It might also ask you questions you've already answered once. But do not worry, - everything is in order. Click Lets get started below to begin your upgrade. + everything is in order. Click Let's get started below to begin your upgrade.

Enjoy! @@ -43,7 +43,7 @@
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx index 46b066cbf1..b696c6d594 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx @@ -136,9 +136,6 @@ - @@ -153,9 +150,6 @@ - -
- <%=umbraco.ui.Text("show",this.getUser())%> - <%=umbraco.ui.Text("general", "alias",this.getUser())%>
- - @@ -179,13 +173,10 @@
- + - - - + 0) diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx index 661b86726c..7812e9b16d 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx @@ -173,7 +173,7 @@

2. Getting a database setup for umbraco.
- For first time users, we recommend you select "quick-and-simple file-based database". + For first time users, we recommend you select "quick-and-simple embedded database". This will install an easy to use database, that does not require any additional software to use.
Alternatively, you can install Microsoft SQL Server, which will require a bit more diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs index 4ba30e2212..16df5f2c40 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs @@ -92,7 +92,7 @@ namespace umbraco.presentation.install.steps } - if (GlobalSettings.ConfigurationStatus.Trim() == "") + if (String.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus)) BasePages.UmbracoEnsuredPage.doLogin(u); Helper.RedirectToNextStep(this.Page); diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx index 6b8f29310a..09a6fe2413 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx @@ -34,7 +34,7 @@

As this is an upgrade, the wizard might skip steps that are only needed for new umbraco installations. It might also ask you questions you've already answered once. But do not worry, - everything is in order. Click Lets get started below to begin your upgrade. + everything is in order. Click Let's get started below to begin your upgrade.

Enjoy! @@ -43,7 +43,7 @@
 
- Lets get started! + Let's get started!
\ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs index de5babe892..b69ab00bf3 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs @@ -17,8 +17,8 @@ namespace umbraco.presentation.install protected void Page_Load(object sender, System.EventArgs e) { - - if (!String.IsNullOrEmpty(GlobalSettings.ConfigurationStatus.Trim())) + // Display the Umbraco upgrade message if Umbraco is already installed + if (String.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus) == false) { ph_install.Visible = false; ph_upgrade.Visible = true; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx index 46b066cbf1..2510cb45b2 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx @@ -136,9 +136,6 @@ - @@ -153,9 +150,6 @@ - - diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs index f20ce88607..f98e10f1d5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs @@ -136,7 +136,6 @@ namespace umbraco.cms.presentation.developer DropDownList macroElementType = (DropDownList)item.FindControl("macroPropertyType"); MacroProperty mp = new MacroProperty(int.Parse(macroPropertyID.Value)); - mp.Public = macroElementShow.Checked; mp.Type = new MacroPropertyType(int.Parse(macroElementType.SelectedValue)); mp.Alias = macroElementAlias.Text; mp.Name = macroElementName.Text; @@ -253,7 +252,6 @@ namespace umbraco.cms.presentation.developer public void macroPropertyCreate(object sender, EventArgs e) { - CheckBox macroPropertyHiddenNew = (CheckBox)((Control)sender).Parent.FindControl("macroPropertyHiddenNew"); TextBox macroPropertyAliasNew = (TextBox)((Control)sender).Parent.FindControl("macroPropertyAliasNew"); TextBox macroPropertyNameNew = (TextBox)((Control)sender).Parent.FindControl("macroPropertyNameNew"); DropDownList macroPropertyTypeNew = (DropDownList)((Control)sender).Parent.FindControl("macroPropertyTypeNew"); @@ -277,7 +275,7 @@ namespace umbraco.cms.presentation.developer { MacroProperty mp = new MacroProperty(); mp.Macro = m_macro; - mp.Public = macroPropertyHiddenNew.Checked; + mp.Public = true; mp.Type = new MacroPropertyType(int.Parse(macroPropertyTypeNew.SelectedValue)); mp.Alias = macroPropertyAliasNew.Text; mp.Name = macroPropertyNameNew.Text; diff --git a/src/umbraco.cms/businesslogic/macro/MacroProperty.cs b/src/umbraco.cms/businesslogic/macro/MacroProperty.cs index 681ea158bd..7316c86c66 100644 --- a/src/umbraco.cms/businesslogic/macro/MacroProperty.cs +++ b/src/umbraco.cms/businesslogic/macro/MacroProperty.cs @@ -65,6 +65,7 @@ namespace umbraco.cms.businesslogic.macro /// /// If not, the field can be manipulated by a default value given by the MacroPropertyType, this is s /// + [Obsolete] public bool Public { get { return _public; } diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index 8add844687..10f4195f72 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -185,7 +185,7 @@ namespace umbraco.cms.businesslogic.web select count(children.id) as children, umbracoNode.id, umbracoNode.uniqueId, umbracoNode.level, umbracoNode.parentId, cmsDocument.documentUser, coalesce(cmsDocument.templateId, cmsDocumentType.templateNodeId) as templateId, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0) as isPublished, umbracoNode.createDate, - cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsContentType.icon, cmsContentType.alias, + cmsDocument.text, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsDocument.releaseDate, cmsDocument.expireDate, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, cmsContentType.masterContentType, cmsContentType.nodeId as contentTypeId, umbracoNode.nodeUser from umbracoNode @@ -202,7 +202,7 @@ namespace umbraco.cms.businesslogic.web cmsDocument.templateId, cmsDocumentType.templateNodeId, umbracoNode.path, umbracoNode.sortOrder, coalesce(publishCheck.published,0), umbracoNode.createDate, cmsDocument.text, cmsContentType.icon, cmsContentType.alias, cmsContentType.thumbnail, cmsContentType.description, - cmsContentType.masterContentType, cmsContentType.nodeId, cmsDocument.updateDate, cmsContentVersion.versionDate, umbracoNode.nodeUser + cmsContentType.masterContentType, cmsContentType.nodeId, cmsDocument.updateDate, cmsContentVersion.versionDate, cmsDocument.releaseDate, cmsDocument.expireDate, umbracoNode.nodeUser order by {1} "; @@ -1697,6 +1697,11 @@ namespace umbraco.cms.businesslogic.web , masterContentType , dr.GetInt("contentTypeId") , dr.GetInt("templateId")); + + if (!dr.IsNull("releaseDate")) + _release = dr.GetDateTime("releaseDate"); + if (!dr.IsNull("expireDate")) + _expire = dr.GetDateTime("expireDate"); } protected void SaveXmlPreview(XmlDocument xd)
- <%=umbraco.ui.Text("show",this.getUser())%> - <%=umbraco.ui.Text("general", "alias",this.getUser())%>
- - @@ -178,9 +172,6 @@
- -