diff --git a/.hgsubstate b/.hgsubstate index 7e0d9464c..8c7c58232 100644 --- a/.hgsubstate +++ b/.hgsubstate @@ -1,7 +1,7 @@ c47525e90819321d37962a11313006a4ccfc8362 src/Orchard.Web/Modules/Orchard.AntiSpam 03306c0dad118c03c4ee21ce274a5f9c5855aec3 src/Orchard.Web/Modules/Orchard.Autoroute 5eb5861244852a382332abfbfe2d28ac1b9bd419 src/Orchard.Web/Modules/Orchard.ContentPermissions -9a8fb6bcb690b4a2adf819ca03053d645c58a568 src/Orchard.Web/Modules/Orchard.ContentPicker +e402ad87a17019d745d692f4d5e29f8174868764 src/Orchard.Web/Modules/Orchard.ContentPicker 4b72948eaa72b8726fa0e000dffc9db8c440903d src/Orchard.Web/Modules/Orchard.CustomForms b639cb33d2ba038de6048350400b664399608996 src/Orchard.Web/Modules/Orchard.Forms b748de63e3cf8debfc3eba77f26089705147047d src/Orchard.Web/Modules/Orchard.Rules diff --git a/src/Orchard.Web/Core/Common/Module.txt b/src/Orchard.Web/Core/Common/Module.txt index fd3b534f3..eb92063b3 100644 --- a/src/Orchard.Web/Core/Common/Module.txt +++ b/src/Orchard.Web/Core/Common/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The common module introduces content parts that are going to be used by most content types (common, body, identity). FeatureDescription: Core content parts. Dependencies: Settings diff --git a/src/Orchard.Web/Core/Containers/Module.txt b/src/Orchard.Web/Core/Containers/Module.txt index 33e907335..466860152 100644 --- a/src/Orchard.Web/Core/Containers/Module.txt +++ b/src/Orchard.Web/Core/Containers/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.4.2 -OrchardVersion: 1.4.2 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The containers module introduces container and containable behaviors for content items. FeatureDescription: Container and containable parts to enable parent-child relationships between content items. Dependencies: Contents, Feeds diff --git a/src/Orchard.Web/Core/Contents/Module.txt b/src/Orchard.Web/Core/Contents/Module.txt index 0852191f2..733e34177 100644 --- a/src/Orchard.Web/Core/Contents/Module.txt +++ b/src/Orchard.Web/Core/Contents/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The contents module enables the creation of custom content types. Features: Contents diff --git a/src/Orchard.Web/Core/Dashboard/Module.txt b/src/Orchard.Web/Core/Dashboard/Module.txt index cb8020e1d..06aba75a6 100644 --- a/src/Orchard.Web/Core/Dashboard/Module.txt +++ b/src/Orchard.Web/Core/Dashboard/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application. FeatureDescription: Standard admin dashboard. Category: Core diff --git a/src/Orchard.Web/Core/Feeds/Module.txt b/src/Orchard.Web/Core/Feeds/Module.txt index f3b327bd2..5a7fb3c2e 100644 --- a/src/Orchard.Web/Core/Feeds/Module.txt +++ b/src/Orchard.Web/Core/Feeds/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The Feeds module is providing RSS feeds to content items. FeatureDescription: RSS feeds for content items. Category: Syndication diff --git a/src/Orchard.Web/Core/Navigation/Module.txt b/src/Orchard.Web/Core/Navigation/Module.txt index 11a0afa49..4497c9d28 100644 --- a/src/Orchard.Web/Core/Navigation/Module.txt +++ b/src/Orchard.Web/Core/Navigation/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The navigation module creates and manages a simple navigation menu for the front-end of the application and allows you to add content items to the admin menu. FeatureDescription: Menu management. Category: Core diff --git a/src/Orchard.Web/Core/Reports/Module.txt b/src/Orchard.Web/Core/Reports/Module.txt index 98cff4e60..85e63ae8f 100644 --- a/src/Orchard.Web/Core/Reports/Module.txt +++ b/src/Orchard.Web/Core/Reports/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The dashboard module is providing the reports screen of the application. FeatureDescription: Reports management. Category: Core diff --git a/src/Orchard.Web/Core/Scheduling/Module.txt b/src/Orchard.Web/Core/Scheduling/Module.txt index f59aa0afd..9e97b93ad 100644 --- a/src/Orchard.Web/Core/Scheduling/Module.txt +++ b/src/Orchard.Web/Core/Scheduling/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The scheduling module enables background task scheduling. FeatureDescription: Scheduled background tasks. Category: Core diff --git a/src/Orchard.Web/Core/Settings/Module.txt b/src/Orchard.Web/Core/Settings/Module.txt index 5c9c305d0..0d586f229 100644 --- a/src/Orchard.Web/Core/Settings/Module.txt +++ b/src/Orchard.Web/Core/Settings/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The settings module creates site settings that other modules can contribute to. FeatureDescription: Site settings. Category: Core diff --git a/src/Orchard.Web/Core/Shapes/Module.txt b/src/Orchard.Web/Core/Shapes/Module.txt index 9e8b872b7..d21b5315c 100644 --- a/src/Orchard.Web/Core/Shapes/Module.txt +++ b/src/Orchard.Web/Core/Shapes/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The shapes module contains core shape templates and display hooks. FeatureDescription: Core shape templates and display hooks. Category: Core diff --git a/src/Orchard.Web/Core/Title/Module.txt b/src/Orchard.Web/Core/Title/Module.txt index 469a34dd7..973124ea1 100644 --- a/src/Orchard.Web/Core/Title/Module.txt +++ b/src/Orchard.Web/Core/Title/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The title module enables content items to have titles. FeatureDescription: Title content part. Category: Core diff --git a/src/Orchard.Web/Core/XmlRpc/Module.txt b/src/Orchard.Web/Core/XmlRpc/Module.txt index 156784300..7979e8aaa 100644 --- a/src/Orchard.Web/Core/XmlRpc/Module.txt +++ b/src/Orchard.Web/Core/XmlRpc/Module.txt @@ -2,8 +2,8 @@ AntiForgery: enabled Author: The Orchard Team Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 +Version: 1.5.1 +OrchardVersion: 1.5.1 Description: The XmlRpc module enables creation of contents from client applications such as LiveWriter. FeatureDescription: XML-RPC opt-in implementation. Category: Content Publishing diff --git a/src/Orchard.Web/Properties/AssemblyInfo.cs b/src/Orchard.Web/Properties/AssemblyInfo.cs index c5c3a7b32..bf0449aff 100644 --- a/src/Orchard.Web/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Properties/AssemblyInfo.cs @@ -1,6 +1,5 @@ using System.Reflection; using System.Runtime.InteropServices; -using System.Security; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information @@ -34,6 +33,6 @@ using System.Security; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.5")] -[assembly: AssemblyFileVersion("1.5")] +[assembly: AssemblyVersion("1.5.1")] +[assembly: AssemblyFileVersion("1.5.1")] diff --git a/src/Orchard/Properties/AssemblyInfo.cs b/src/Orchard/Properties/AssemblyInfo.cs index 6beb6c376..ecf6d7ee3 100644 --- a/src/Orchard/Properties/AssemblyInfo.cs +++ b/src/Orchard/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ using System.Security; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5")] -[assembly: AssemblyFileVersion("1.5")] +[assembly: AssemblyVersion("1.5.1")] +[assembly: AssemblyFileVersion("1.5.1")]