lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-21 11:17:28 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixing merge errors and side effects.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2011-02-22 18:17:17 -08:00
parent 7842a0f79b
commit 0b3fb811ad
10 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj
View File

@@ -76,8 +76,12 @@
</ItemGroup>
<ItemGroup>
<Content Include="Content\synchronizing.gif" />
<Content Include="Recipes\blog.recipe.xml" />
<Content Include="Recipes\default.recipe.xml" />
<Content Include="Recipes\blog.recipe.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="Recipes\default.recipe.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="Recipes\customcontentsite.recipe.xml" />
<Content Include="Recipes\minimal.recipe.xml" />
<Content Include="Scripts\setup.js" />

4
src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
View File

@@ -8,10 +8,10 @@
<Tags>blog</Tags>
<Version>1.0</Version>
</Recipe>
<Feature enable="Orchard.Blogs,Orchard.Comments,Orchard.Tags,
XmlRpc,Orchard.Blogs.RemotePublishing,
TinyMce,Orchard.Media,Orchard.PublishLater,
TinyMce,Orchard.Media,Orchard.MediaPicker,Orchard.PublishLater,
Orchard.jQuery,Orchard.Widgets,
Orchard.Scripting,Orchard.Scripting.Lightweight,
PackagingServices,Orchard.Packaging,Gallery,

2
src/Orchard.Web/Modules/Orchard.Setup/Recipes/customcontentsite.recipe.xml
View File

@@ -10,7 +10,7 @@
</Recipe>
<Feature enable="Orchard.ContentTypes,Orchard.Lists,Orchard.PublishLater,
Orchard.jQuery,TinyMce,Orchard.Media,
Orchard.jQuery,TinyMce,Orchard.Media,Orchard.MediaPicker,
PackagingServices,Orchard.Packaging,Gallery,TheThemeMachine" />
<Metadata>

2
src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml
View File

@@ -10,7 +10,7 @@
</Recipe>
<Feature enable="Orchard.Blogs,Orchard.Comments,Orchard.Tags,
Orchard.Lists,TinyMce,Orchard.Media,Orchard.PublishLater,
Orchard.Lists,TinyMce,Orchard.Media,Orchard.MediaPicker,Orchard.PublishLater,
Orchard.jQuery,Orchard.Widgets,Orchard.ContentTypes,
Orchard.Scripting,Orchard.Scripting.Lightweight,
PackagingServices,Orchard.Packaging,Gallery,

3
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
View File

@@ -77,8 +77,7 @@ namespace Orchard.Setup.Services {
"Common", "Containers", "Contents", "Dashboard", "Feeds", "HomePage", "Navigation", "Reports", "Routable", "Scheduling", "Settings", "Shapes",
// Modules
"Orchard.Pages", "Orchard.Themes", "Orchard.Users", "Orchard.Roles", "Orchard.Modules",
"PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes"
"Orchard.MediaPicker",
"PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes",
};
context.EnabledFeatures = hardcoded;