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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-10-01 11:50:05 -07:00
parent 5befbad6be 68cc42301b
commit cfc744c33e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AzurePackage.proj
View File

@@ -18,7 +18,7 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/> <Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Cloud Service\v1.0\Microsoft.CloudService.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\Cloud Service\1.0\Microsoft.CloudService.targets" />
<!-- Coordinating Targets --> <!-- Coordinating Targets -->

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

@@ -39,7 +39,7 @@ Scenario: Some of the initial form values are required
Scenario: Calling setup on a brand new install Scenario: Calling setup on a brand new install
Given I have a clean site with Given I have a clean site with
| extension | names | | extension | names |
| module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.jQuery, TinyMce | | module | Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Orchard.Modules, Orchard.jQuery, TinyMce |
| core | Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc | | core | Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routable, PublishLater, Scheduling, Settings, Shapes, XmlRpc |
| theme | SafeMode, Classic | | theme | SafeMode, Classic |
And I am on "/Setup" And I am on "/Setup"

2
src/Orchard.Specs/Setup.feature.cs generated
View File

@@ -177,7 +177,7 @@ this.ScenarioSetup(scenarioInfo);
table4.AddRow(new string[] { table4.AddRow(new string[] {
"module", "module",
"Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Or" + "Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.Themes, Or" +
"chard.jQuery, TinyMce"}); "chard.Modules, Orchard.jQuery, TinyMce"});
table4.AddRow(new string[] { table4.AddRow(new string[] {
"core", "core",
"Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routa" + "Common, Contents, ContentsLocation, Dashboard, Feeds, HomePage, Navigation, Routa" +