yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge issues

Browse Source
This commit is contained in:
Shannon
2014-03-04 11:42:11 +11:00
parent 000b2b639f
commit 0497771750
11 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Install/InstallSteps/DatabaseConfigureStep.cs
View File

@@ -13,7 +13,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("DatabaseConfigure", "database", 3)]
[InstallSetupStep("DatabaseConfigure", "database", 3, "Configuring your database connection")]
internal class DatabaseConfigureStep : InstallSetupStep<DatabaseModel>
{
private readonly ApplicationContext _applicationContext;

2
src/Umbraco.Web/Install/InstallSteps/DatabaseInstallStep.cs
View File

@@ -8,7 +8,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("DatabaseInstall", 4)]
[InstallSetupStep("DatabaseInstall", 4, "Installing database tables and default system data")]
internal class DatabaseInstallStep : InstallSetupStep<object>
{
private readonly ApplicationContext _applicationContext;

2
src/Umbraco.Web/Install/InstallSteps/DatabaseUpgradeStep.cs
View File

@@ -7,7 +7,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("DatabaseUpgrade", 5)]
[InstallSetupStep("DatabaseUpgrade", 5, "Upgrading your database to the latest version")]
internal class DatabaseUpgradeStep : InstallSetupStep<object>
{
private readonly ApplicationContext _applicationContext;

2
src/Umbraco.Web/Install/InstallSteps/FilePermissionsStep.cs
View File

@@ -8,7 +8,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("Permissions", 0)]
[InstallSetupStep("Permissions", 0, "Ensuring your file permissions are set correctly")]
internal class FilePermissionsStep : InstallSetupStep<object>
{
public override InstallSetupResult Execute(object model)

2
src/Umbraco.Web/Install/InstallSteps/MajorVersion7UpgradeReport.cs
View File

@@ -9,7 +9,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("MajorVersion7UpgradeReport", 2)]
[InstallSetupStep("MajorVersion7UpgradeReport", 2, "Checking for compatibility issues with upgrade")]
internal class MajorVersion7UpgradeReport : InstallSetupStep<object>
{
private readonly ApplicationContext _applicationContext;

2
src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs
View File

@@ -10,7 +10,7 @@ using GlobalSettings = umbraco.GlobalSettings;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("UmbracoVersion", 9)]
[InstallSetupStep("UmbracoVersion", 9, "Wrapping up the system configuration")]
internal class SetUmbracoVersionStep : InstallSetupStep<object>
{
private readonly ApplicationContext _applicationContext;

2
src/Umbraco.Web/Install/InstallSteps/StarterKitCleanupStep.cs
View File

@@ -7,7 +7,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("StarterKitCleanup", 8)]
[InstallSetupStep("StarterKitCleanup", 8, "Cleaning up temporary files")]
internal class StarterKitCleanupStep : InstallSetupStep<object>
{
private readonly InstallStatusType _status;

2
src/Umbraco.Web/Install/InstallSteps/StarterKitDownloadStep.cs
View File

@@ -6,7 +6,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("StarterKitDownload", "starterKit", 6)]
[InstallSetupStep("StarterKitDownload", "starterKit", 6, "Downloading a starter website from our.umbraco.org, hold tight, this could take a little while")]
internal class StarterKitDownloadStep : InstallSetupStep<Guid>
{
private readonly InstallStatusType _status;

2
src/Umbraco.Web/Install/InstallSteps/StarterKitInstallStep.cs
View File

@@ -7,7 +7,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("StarterKitInstall", 7)]
[InstallSetupStep("StarterKitInstall", 7, "Installing a starter website to help you get off to a great start")]
internal class StarterKitInstallStep : InstallSetupStep<object>
{
private readonly InstallStatusType _status;

2
src/Umbraco.Web/Install/InstallSteps/UserStep.cs
View File

@@ -8,7 +8,7 @@ using Umbraco.Web.Install.Models;
namespace Umbraco.Web.Install.InstallSteps
{
[InstallSetupStep("User", "user", 4)]
[InstallSetupStep("User", "user", 4, "Saving your user credentials")]
internal class UserStep : InstallSetupStep<UserModel>
{
private readonly ApplicationContext _applicationContext;

4
src/Umbraco.Web/Install/Models/InstallSetupStepAttribute.cs
View File

@@ -4,7 +4,7 @@ namespace Umbraco.Web.Install.Models
{
public sealed class InstallSetupStepAttribute : Attribute
{
public InstallSetupStepAttribute(string name, string view, int serverOrder)
public InstallSetupStepAttribute(string name, string view, int serverOrder, string description)
{
Name = name;
View = view;
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Install.Models
Description = description;
}
public InstallSetupStepAttribute(string name, int serverOrder)
public InstallSetupStepAttribute(string name, int serverOrder, string description)
{
Name = name;
View = string.Empty;