lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source
This commit is contained in:
Sebastien Ros
2014-05-16 16:56:02 -07:00
parent 54345ead5c 34575b1732
commit d277c42093
164 changed files with 7477 additions and 6596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Profile/Properties/AssemblyInfo.cs
View File

@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

9
src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
View File

@@ -24,8 +24,8 @@ namespace Orchard.Specs.Bindings {
webApp.GivenIHaveACleanSiteWith( webApp.GivenIHaveACleanSiteWith(
virtualDirectory, virtualDirectory,
TableData( TableData(
new { extension = "Module", names = "Orchard.Setup, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp" }, new { extension = "Module", names = "Lucene, Markdown, Orchard.Alias, Orchard.AntiSpam, Orchard.ArchiveLater, Orchard.Autoroute, Orchard.Azure, Orchard.Blogs, Orchard.Caching, Orchard.CodeGeneration, Orchard.Comments, Orchard.ContentPermissions, Orchard.ContentPicker, Orchard.ContentTypes, Orchard.CustomForms, Orchard.DesignerTools, Orchard.Email, Orchard.Fields, Orchard.Forms, Orchard.ImageEditor, Orchard.ImportExport, Orchard.Indexing, Orchard.JobsQueue, Orchard.jQuery, Orchard.Lists, Orchard.Localization, Orchard.Media, Orchard.MediaLibrary, Orchard.MediaPicker, Orchard.MediaProcessing, Orchard.Migrations, Orchard.Modules, Orchard.MultiTenancy, Orchard.OutputCache, Orchard.Packaging, Orchard.Pages, Orchard.Projections, Orchard.PublishLater, Orchard.Recipes, Orchard.Roles, Orchard.Rules, Orchard.Scripting, Orchard.Scripting.CSharp, Orchard.Scripting.Dlr, Orchard.Search, Orchard.SecureSocketsLayer, Orchard.Setup, Orchard.Tags, Orchard.TaskLease, Orchard.Taxonomies, Orchard.Templates, Orchard.Themes, Orchard.Tokens, Orchard.Users, Orchard.Warmup, Orchard.Widgets, Orchard.Workflows, SysCache, TinyMce, Upgrade" },
new { extension = "Core", names = "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title, Reports" }, new { extension = "Core", names = "Common, Containers, Contents, Dashboard, Feeds, Navigation, Reports, Scheduling, Settings, Shapes, Title, XmlRpc" },
new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" })); new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" }));
webApp.WhenIGoTo("Setup"); webApp.WhenIGoTo("Setup");
@@ -59,6 +59,11 @@ namespace Orchard.Specs.Bindings {
descriptor.Features.Concat(new[] { new ShellFeature { Name = name } }), descriptor.Features.Concat(new[] { new ShellFeature { Name = name } }),
descriptor.Parameters); descriptor.Parameters);
} }
// this is needed to force the tenant to restart when a new feature is enabled,
// as DefaultOrchardHost maintains this list in a thread context otherwise
// and looses the information
MvcApplication.RestartTenant("Default");
}); });
} }

2
src/Orchard.Specs/Comments.feature
View File

@@ -74,6 +74,6 @@ Scenario: Moderated comments are not displayed
And I hit "Submit Comment" And I hit "Submit Comment"
And I am redirected And I am redirected
# because the ToUrlString extension method breaks in this specific (test) environment, the returnUrl is broken... # because the ToUrlString extension method breaks in this specific (test) environment, the returnUrl is broken...
# And I go to "my-blog/my-post" And I go to "my-blog/my-post"
Then I should see "Hi there" Then I should see "Hi there"
And I should not see "This is a moderated comment" And I should not see "This is a moderated comment"

4
src/Orchard.Specs/Comments.feature.cs generated
View File

@@ -3,7 +3,7 @@
// This code was generated by SpecFlow (http://www.specflow.org/). // This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77 // SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0 // SpecFlow Generator Version:1.9.0.0
// Runtime Version:4.0.30319.33440 // Runtime Version:4.0.30319.34014
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -237,6 +237,8 @@ this.ScenarioSetup(scenarioInfo);
testRunner.And("I hit \"Submit Comment\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); testRunner.And("I hit \"Submit Comment\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 75 #line 75
testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And "); testRunner.And("I am redirected", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 77
testRunner.And("I go to \"my-blog/my-post\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 78 #line 78
testRunner.Then("I should see \"Hi there\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then "); testRunner.Then("I should see \"Hi there\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line 79 #line 79

4
src/Orchard.Specs/Hosting/Orchard.Web/Config/HostComponents.Debug.config Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<HostComponents xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
</HostComponents>

12
src/Orchard.Specs/Hosting/Orchard.Web/Config/HostComponents.Release.config Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- For more information on using web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<HostComponents xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<Components>
<!-- Disable all file monitoring but not modules/themes discovery -->
<Component xdt:Locator="Condition(@Type != 'Orchard.Environment.Extensions.Folders.ExtensionHarvester')">
<Properties>
<Property Name="DisableMonitoring" Value="true" xdt:Locator="Match(Name)" xdt:Transform="SetAttributes(Value)" />
</Properties>
</Component>
</Components>
</HostComponents>

100
src/Orchard.Specs/Hosting/Orchard.Web/Config/HostComponents.config Normal file
View File

@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8" ?>
<HostComponents>
<Components>
<Component Type="Orchard.Environment.Extensions.ExtensionMonitoringCoordinator">
<Properties>
<!-- Set Value="true" to disable new extensions monitoring -->
<Property Name="Disabled" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy.PlacementFileParser">
<Properties>
<!-- Set Value="true" to disable Placement files monitoring (Placement.info) -->
<Property Name="DisableMonitoring" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy.ShapeTemplateBindingStrategy">
<Properties>
<!-- Set Value="true" to disable template views monitoring (Views\*.cshtml) -->
<Property Name="DisableMonitoring" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.Environment.Extensions.Folders.ExtensionHarvester">
<Properties>
<!-- Set Value="true" to disable extension folders monitoring (new files in modules and themes) -->
<Property Name="DisableMonitoring" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.Environment.Extensions.Compilers.DefaultProjectFileParser">
<Properties>
<!-- Set Value="true" to disable project files monitoring (/Modules/**/*.csproj) -->
<Property Name="DisableMonitoring" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.Environment.Extensions.Loaders.DynamicExtensionLoader">
<Properties>
<!-- Set Value="true" to disable source files monitoring -->
<Property Name="DisableMonitoring" Value="false"/>
<!-- Set Value="true" to completely disable the Dynamic Extension Loader -->
<Property Name="Disabled" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.Environment.Extensions.Loaders.PrecompiledExtensionLoader">
<Properties>
<!-- Set Value="true" to disable pre-compiled files monitoring (~/Modules/**/bin/*.dll) -->
<Property Name="DisableMonitoring" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.FileSystems.Dependencies.DefaultDependenciesFolder">
<Properties>
<!-- Set Value="true" to disable the dependencies folder monitoring -->
<Property Name="DisableMonitoring" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.FileSystems.Dependencies.DefaultExtensionDependenciesManager">
<Properties>
<!-- Set Value="true" to disable compiled dependencides files monitoring -->
<Property Name="DisableMonitoring" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.Localization.Services.DefaultLocalizedStringManager">
<Properties>
<!-- Set Value="true" to disable localization files monitoring (*.po) -->
<Property Name="DisableMonitoring" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.Caching.DefaultParallelCacheContext">
<Properties>
<!-- Set Value="true" to disable parallel cache resolution -->
<Property Name="Disabled" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.Data.SessionConfigurationCache">
<Properties>
<!-- Set Value="true" to disable session configuration cache (mappings.bin). Recommended when using multiple instances. -->
<Property Name="Disabled" Value="false"/>
</Properties>
</Component>
<Component Type="Orchard.Environment.Descriptor.ShellDescriptorCache">
<Properties>
<!-- Set Value="true" to disable shell descriptors cache (cache.dat). Recommended when using multiple instances. -->
<Property Name="Disabled" Value="false"/>
</Properties>
</Component>
</Components>
</HostComponents>

12
src/Orchard.Specs/Hosting/Orchard.Web/Global.asax.cs
View File

@@ -46,6 +46,18 @@ namespace Orchard.Specs.Hosting.Orchard.Web {
_host.ReloadExtensions(); _host.ReloadExtensions();
} }
public static void RestartTenant(string name) {
var settings = _container.Resolve<IShellSettingsManager>().LoadSettings().SingleOrDefault(x => x.Name == name);
if (settings == null) {
settings = new ShellSettings {
Name = name,
State = TenantState.Uninitialized
};
}
((DefaultOrchardHost)_host).ActivateShell(settings);
}
public static IWorkContextScope CreateStandaloneEnvironment(string name) { public static IWorkContextScope CreateStandaloneEnvironment(string name) {
var settings = _container.Resolve<IShellSettingsManager>().LoadSettings().SingleOrDefault(x => x.Name == name); var settings = _container.Resolve<IShellSettingsManager>().LoadSettings().SingleOrDefault(x => x.Name == name);
if (settings == null) { if (settings == null) {

3
src/Orchard.Specs/Hosting/WebHost.cs
View File

@@ -195,6 +195,7 @@ namespace Orchard.Specs.Hosting {
sourceModule.ShallowCopy("*.txt", targetModule); sourceModule.ShallowCopy("*.txt", targetModule);
sourceModule.ShallowCopy("*.info", targetModule); sourceModule.ShallowCopy("*.info", targetModule);
sourceModule.ShallowCopy("*.config", targetModule);
if ((deploymentOptions & ExtensionDeploymentOptions.SourceCode) == ExtensionDeploymentOptions.SourceCode) { if ((deploymentOptions & ExtensionDeploymentOptions.SourceCode) == ExtensionDeploymentOptions.SourceCode) {
sourceModule.ShallowCopy("*.csproj", targetModule); sourceModule.ShallowCopy("*.csproj", targetModule);
@@ -207,6 +208,8 @@ namespace Orchard.Specs.Hosting {
if (sourceModule.Combine("Views").IsDirectory) if (sourceModule.Combine("Views").IsDirectory)
sourceModule.Combine("Views").DeepCopy(targetModule.Combine("Views")); sourceModule.Combine("Views").DeepCopy(targetModule.Combine("Views"));
// don't copy content folders as they are useless in this headless scenario
} }
public void CopyFile(string source, string destination) { public void CopyFile(string source, string destination) {

9
src/Orchard.Specs/Orchard.Specs.csproj
View File

@@ -326,6 +326,15 @@
<Generator>SpecFlowSingleFileGenerator</Generator> <Generator>SpecFlowSingleFileGenerator</Generator>
<LastGenOutput>Enumeration.feature.cs</LastGenOutput> <LastGenOutput>Enumeration.feature.cs</LastGenOutput>
</None> </None>
<WebConfigsToTransform Include="Hosting\Orchard.Web\Config\HostComponents.config">
<SubType>Designer</SubType>
</WebConfigsToTransform>
<None Include="Hosting\Orchard.Web\Config\HostComponents.Debug.config">
<DependentUpon>HostComponents.config</DependentUpon>
</None>
<None Include="Hosting\Orchard.Web\Config\HostComponents.Release.config">
<DependentUpon>HostComponents.config</DependentUpon>
</None>
<None Include="Input.feature"> <None Include="Input.feature">
<Generator>SpecFlowSingleFileGenerator</Generator> <Generator>SpecFlowSingleFileGenerator</Generator>
<LastGenOutput>Input.feature.cs</LastGenOutput> <LastGenOutput>Input.feature.cs</LastGenOutput>

4
src/Orchard.Specs/Properties/AssemblyInfo.cs
View File

@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

4
src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
View File

@@ -32,8 +32,8 @@ using System.Security;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]
// Enable web application to call this assembly in Full Trust // Enable web application to call this assembly in Full Trust
[assembly: AllowPartiallyTrustedCallers] [assembly: AllowPartiallyTrustedCallers]

2
src/Orchard.Web/Core/Common/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The common module introduces content parts that are going to be used by most content types (common, body, identity). Description: The common module introduces content parts that are going to be used by most content types (common, body, identity).
FeatureDescription: Core content parts. FeatureDescription: Core content parts.

2
src/Orchard.Web/Core/Containers/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The containers module introduces container and containable behaviors for content items. 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. FeatureDescription: Container and containable parts to enable parent-child relationships between content items.

4
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -249,6 +249,8 @@ namespace Orchard.Core.Contents.Controllers {
if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Couldn't create content"))) if (!Services.Authorizer.Authorize(Permissions.EditContent, contentItem, T("Couldn't create content")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
_contentManager.Create(contentItem, VersionOptions.Draft);
var model = _contentManager.UpdateEditor(contentItem, this); var model = _contentManager.UpdateEditor(contentItem, this);
if (!ModelState.IsValid) { if (!ModelState.IsValid) {
@@ -256,8 +258,6 @@ namespace Orchard.Core.Contents.Controllers {
return View(model); return View(model);
} }
_contentManager.Create(contentItem, VersionOptions.Draft);
conditionallyPublish(contentItem); conditionallyPublish(contentItem);
Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName) Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)

2
src/Orchard.Web/Core/Contents/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The contents module enables the creation of custom content types. Description: The contents module enables the creation of custom content types.
Features: Features:

2
src/Orchard.Web/Core/Dashboard/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application. Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application.
FeatureDescription: Standard admin dashboard. FeatureDescription: Standard admin dashboard.

2
src/Orchard.Web/Core/Feeds/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The Feeds module is providing RSS feeds to content items. Description: The Feeds module is providing RSS feeds to content items.
FeatureDescription: RSS feeds for content items. FeatureDescription: RSS feeds for content items.

2
src/Orchard.Web/Core/Navigation/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
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. 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. FeatureDescription: Menu management.

4
src/Orchard.Web/Core/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Core/Reports/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The dashboard module is providing the reports screen of the application. Description: The dashboard module is providing the reports screen of the application.
FeatureDescription: Reports management. FeatureDescription: Reports management.

2
src/Orchard.Web/Core/Scheduling/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The scheduling module enables background task scheduling. Description: The scheduling module enables background task scheduling.
FeatureDescription: Scheduled background tasks. FeatureDescription: Scheduled background tasks.

2
src/Orchard.Web/Core/Settings/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The settings module creates site settings that other modules can contribute to. Description: The settings module creates site settings that other modules can contribute to.
FeatureDescription: Site settings. FeatureDescription: Site settings.

2
src/Orchard.Web/Core/Shapes/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The shapes module contains core shape templates and display hooks. Description: The shapes module contains core shape templates and display hooks.
FeatureDescription: Core shape templates and display hooks. FeatureDescription: Core shape templates and display hooks.

2
src/Orchard.Web/Core/Title/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The title module enables content items to have titles. Description: The title module enables content items to have titles.
FeatureDescription: Title content part. FeatureDescription: Title content part.

2
src/Orchard.Web/Core/XmlRpc/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The XmlRpc module enables creation of contents from client applications such as LiveWriter. Description: The XmlRpc module enables creation of contents from client applications such as LiveWriter.
FeatureDescription: XML-RPC opt-in implementation. FeatureDescription: XML-RPC opt-in implementation.

2
src/Orchard.Web/Modules/Lucene/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The Lucene module enables the site to be indexed using Lucene.NET. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site. Description: The Lucene module enables the site to be indexed using Lucene.NET. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site.
FeatureDescription: Lucene indexing services. FeatureDescription: Lucene indexing services.

4
src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Markdown/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The Markdown module enables rich text contents to be created using the Markdown syntax. Description: The Markdown module enables rich text contents to be created using the Markdown syntax.
FeatureDescription: Markdown editor. FeatureDescription: Markdown editor.

4
src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs
View File

@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Alias/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Alias
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Maps friendly urls to specific module actions. Description: Maps friendly urls to specific module actions.
FeatureDescription: Maps friendly urls to specific module actions. FeatureDescription: Maps friendly urls to specific module actions.

4
src/Orchard.Web/Modules/Orchard.Alias/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt
View File

@@ -2,7 +2,7 @@ Name: AntiSpam
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Provides anti-spam services to protect your content from malicious submissions. Description: Provides anti-spam services to protect your content from malicious submissions.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.AntiSpam/Properties/AssemblyInfo.cs
View File

@@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
View File

@@ -3,7 +3,7 @@ Path: ArchiveLater
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The ArchiveLater module introduces scheduled archiving functionality. Description: The ArchiveLater module introduces scheduled archiving functionality.
FeatureDescription: Scheduled archiving. FeatureDescription: Scheduled archiving.

4
src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Autoroute/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Autoroute
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Description for the module Description: Description for the module
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Autoroute/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: Microsoft Open Technologies, Inc Author: Microsoft Open Technologies, Inc
Website: http://msopentech.com Website: http://msopentech.com
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Provides integration of Microsoft Azure Media Services functionality into Orchard. Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Properties/AssemblyInfo.cs
View File

@@ -32,6 +32,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Azure/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Provides a set of Orchard service implementations targeting Microsoft Azure services. Description: Provides a set of Orchard service implementations targeting Microsoft Azure services.
Category: Hosting Category: Hosting

4
src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs
View File

@@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The Orchard Blogs module is implementing basic blogging features. Description: The Orchard Blogs module is implementing basic blogging features.
FeatureDescription: A simple web log. FeatureDescription: A simple web log.

4
src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
View File

@@ -29,6 +29,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Caching/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: Sébastien Ros Author: Sébastien Ros
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Provides an API to cache business data. Description: Provides an API to cache business data.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs
View File

@@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Tools to create Orchard components. Description: Tools to create Orchard components.
FeatureDescription: Tools to create Orchard components. FeatureDescription: Tools to create Orchard components.

4
src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Comments/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The comments system implemented by this module can be applied to arbitrary Orchard content types, such as blogs and pages. It includes comment validation and spam protection through the Akismet service. Description: The comments system implemented by this module can be applied to arbitrary Orchard content types, such as blogs and pages. It includes comment validation and spam protection through the Akismet service.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
View File

@@ -30,5 +30,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Orchard.ContentPermissions
AntiForgery: enabled AntiForgery: enabled
Author: Chris Pyle, S<>bastien Ros Author: Chris Pyle, S<>bastien Ros
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Allows item-level front end view permissions. Description: Allows item-level front end view permissions.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Orchard.ContentPicker
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardcontentpicker.codeplex.com Website: http://orchardcontentpicker.codeplex.com
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: UI for selecting Content Items. Description: UI for selecting Content Items.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs
View File

@@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: ContentTypes modules enables the creation and alteration of content types not based on code. Description: ContentTypes modules enables the creation and alteration of content types not based on code.
Dependencies: Contents Dependencies: Contents

4
src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Custom Forms
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardcustomforms.codeplex.com Website: http://orchardcustomforms.codeplex.com
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Create custom forms like contact forms or content contributions. Description: Create custom forms like contact forms or content contributions.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Contains designer tools to ease the Themes development process Description: Contains designer tools to ease the Themes development process
FeatureName: Shape Tracing FeatureName: Shape Tracing

4
src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Email/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The Email Messaging module adds Email sending functionalities. Description: The Email Messaging module adds Email sending functionalities.
Features: Features:

2
src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
View File

@@ -55,7 +55,7 @@
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration"> <Reference Include="System.Configuration">
<Private>True</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.ApplicationServices" /> <Reference Include="System.Web.ApplicationServices" />

4
src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Fields/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Fields
AntiForgery: enabled AntiForgery: enabled
Author: Antoine Griffard, S<>bastien Ros Author: Antoine Griffard, S<>bastien Ros
Website: http://orchardfields.codeplex.com Website: http://orchardfields.codeplex.com
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Some content fields Description: Some content fields
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Fields/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Forms/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Forms
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardforms.codeplex.com Website: http://orchardforms.codeplex.com
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Provides a system to publish and alter html forms. Description: Provides a system to publish and alter html forms.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Forms/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.ImageEditor/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Adds a client side image editor for Media Library Description: Adds a client side image editor for Media Library
Features: Features:

4
src/Orchard.Web/Modules/Orchard.ImageEditor/Properties/AssemblyInfo.cs
View File

@@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
View File

@@ -3,7 +3,7 @@ Path: ImportExport
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Provides content item data import and export capability. Description: Provides content item data import and export capability.
FeatureDescription: Imports and exports content item data FeatureDescription: Imports and exports content item data

4
src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Indexing/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The Indexing module enables the site to be indexed. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site. Description: The Indexing module enables the site to be indexed. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site.
FeatureDescription: Indexing infrastructure. Requires an index implementation like the Lucene module. FeatureDescription: Indexing infrastructure. Requires an index implementation like the Lucene module.

4
src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.JobsQueue/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: This module provides a jobs queue to process jobs asynchronously. Description: This module provides a jobs queue to process jobs asynchronously.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.JobsQueue/Properties/AssemblyInfo.cs
View File

@@ -31,6 +31,6 @@ using System.Security;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Lists/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Introduces a preconfigured container-enabled content type. Description: Introduces a preconfigured container-enabled content type.
FeatureDescription: A basic container-enabled content type. FeatureDescription: A basic container-enabled content type.

4
src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Localization/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The localization module enables the localization of content items. Description: The localization module enables the localization of content items.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.Localization/Properties/AssemblyInfo.cs
View File

@@ -31,6 +31,6 @@ using System.Security;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.MediaLibrary/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Provides enhanced Media management tools. Description: Provides enhanced Media management tools.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.MediaLibrary/Properties/AssemblyInfo.cs
View File

@@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.MediaProcessing/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: John Murdock, Sébastien Ros Author: John Murdock, Sébastien Ros
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Module for processing Media e.g. image resizing Description: Module for processing Media e.g. image resizing
Category: Media Category: Media

4
src/Orchard.Web/Modules/Orchard.MediaProcessing/Properties/AssemblyInfo.cs
View File

@@ -31,6 +31,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Migrations/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Data migration commands. Description: Data migration commands.
FeatureDescription: Data migration commands. FeatureDescription: Data migration commands.

4
src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Modules/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The Modules module enables the administrator of the site to manage the installed modules as well as activate and de-activate features. Description: The Modules module enables the administrator of the site to manage the installed modules as well as activate and de-activate features.
FeatureDescription: Standard module and feature management. FeatureDescription: Standard module and feature management.

4
src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.MultiTenancy/Module.txt
View File

@@ -3,7 +3,7 @@ Path: MultiTenancy
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The multi-tenancy module enables multiple Orchard sites to run in isolation inside of a single web application, improving site density on a single server or hosted account. Description: The multi-tenancy module enables multiple Orchard sites to run in isolation inside of a single web application, improving site density on a single server or hosted account.
FeatureDescription: Configure multiple site tenants. FeatureDescription: Configure multiple site tenants.

4
src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

12
src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
View File

@@ -86,7 +86,6 @@ namespace Orchard.OutputCache.Filters {
private CapturingResponseFilter _filter; private CapturingResponseFilter _filter;
private CacheItem _cacheItem; private CacheItem _cacheItem;
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
public void OnActionExecuting(ActionExecutingContext filterContext) { public void OnActionExecuting(ActionExecutingContext filterContext) {
@@ -291,12 +290,22 @@ namespace Orchard.OutputCache.Filters {
} }
public void OnActionExecuted(ActionExecutedContext filterContext) { public void OnActionExecuted(ActionExecutedContext filterContext) {
// this means the cache module is not applied in this context
if (_workContext == null) {
return;
}
// handle redirections // handle redirections
_transformRedirect = TransformRedirect(filterContext); _transformRedirect = TransformRedirect(filterContext);
} }
public void OnResultExecuted(ResultExecutedContext filterContext) { public void OnResultExecuted(ResultExecutedContext filterContext) {
// this means the cache module is not applied in this context
if (_workContext == null) {
return;
}
var response = filterContext.HttpContext.Response; var response = filterContext.HttpContext.Response;
if (!_cacheControlStrategy.IsCacheable(filterContext.Result, response)) { if (!_cacheControlStrategy.IsCacheable(filterContext.Result, response)) {
@@ -467,6 +476,7 @@ namespace Orchard.OutputCache.Filters {
var applicationRoot = new UrlHelper(filterContext.HttpContext.Request.RequestContext).MakeAbsolute("/"); var applicationRoot = new UrlHelper(filterContext.HttpContext.Request.RequestContext).MakeAbsolute("/");
if (redirectUrl.StartsWith(applicationRoot, StringComparison.OrdinalIgnoreCase)) { if (redirectUrl.StartsWith(applicationRoot, StringComparison.OrdinalIgnoreCase)) {
redirectUrl = "~/" + redirectUrl.Substring(applicationRoot.Length); redirectUrl = "~/" + redirectUrl.Substring(applicationRoot.Length);
redirectUrl = VirtualPathUtility.ToAbsolute(redirectUrl);
} }
} }

2
src/Orchard.Web/Modules/Orchard.OutputCache/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: Sébastien Ros Author: Sébastien Ros
Website: http://orchardproject.net/ Website: http://orchardproject.net/
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Adds Output Caching functionality. Description: Adds Output Caching functionality.
Features: Features:

4
src/Orchard.Web/Modules/Orchard.OutputCache/Properties/AssemblyInfo.cs
View File

@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The packaging module enables packaging modules using the OPC format. Description: The packaging module enables packaging modules using the OPC format.
FeatureDescription: Commands for creating/installing local modules. FeatureDescription: Commands for creating/installing local modules.

4
src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Pages/Module.txt
View File

@@ -2,7 +2,7 @@
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Introduces a preconfigured page content type. Description: Introduces a preconfigured page content type.
FeatureDescription: A basic page content type. FeatureDescription: A basic page content type.

4
src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.Projections/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Projector
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardprojections.codeplex.com Website: http://orchardprojections.codeplex.com
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: Provides methods to control how lists of content items are filtered and displayed Description: Provides methods to control how lists of content items are filtered and displayed
Category: Content Category: Content

4
src/Orchard.Web/Modules/Orchard.Projections/Properties/AssemblyInfo.cs
View File

@@ -31,5 +31,5 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

2
src/Orchard.Web/Modules/Orchard.PublishLater/Module.txt
View File

@@ -3,7 +3,7 @@ Path: PublishLater
AntiForgery: enabled AntiForgery: enabled
Author: The Orchard Team Author: The Orchard Team
Website: http://orchardproject.net Website: http://orchardproject.net
Version: 1.8 Version: 1.8.1
OrchardVersion: 1.8 OrchardVersion: 1.8
Description: The PublishLater module introduces draft creation and scheduled publishing functionality. Description: The PublishLater module introduces draft creation and scheduled publishing functionality.
FeatureDescription: Draft creation and scheduled publishing. FeatureDescription: Draft creation and scheduled publishing.

4
src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs
View File

@@ -30,6 +30,6 @@ using System.Security;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.8")] [assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8")] [assembly: AssemblyFileVersion("1.8.1")]

Some files were not shown because too many files have changed in this diff Show More