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

Merge branch 'dev' into feature/recipesteps

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeParser.cs
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/blog.recipe.xml
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/core.recipe.xml
	src/Orchard.Web/Modules/Orchard.Setup/Recipes/default.recipe.xml
This commit is contained in:
Sipke Schoorstra
2015-07-17 09:57:45 +01:00
parent c0771e5d56 e562f6adbd
commit 9f7908a410
24 changed files with 162 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@
<Description>A recipe providing the features you need for a personal blog site.</Description>
<Author>The Orchard Team</Author>
<WebSite>http://orchardproject.net</WebSite>
<Category>Default</Category>
<Tags>blog</Tags>
<Version>1.0</Version>
<IsSetupRecipe>true</IsSetupRecipe>
@@ -19,7 +20,7 @@
Orchard.Taxonomies,Orchard.Workflows,
TheThemeMachine" />
<ContentSchema>
<ContentDefinition>
<Types>
<Page ContentTypeSettings.Draftable="True" TypeIndexing.Indexes="Search">
<TitlePart/>
@@ -39,7 +40,7 @@
<Parts>
<BodyPart BodyPartSettings.FlavorDefault="html" />
</Parts>
</ContentSchema>
</ContentDefinition>
<Settings>
<SiteSettingsPart PageSize="20" PageTitleSeparator = " - " />