Merge

--HG--
branch : dev

src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs

@@ -29,7 +29,7 @@ namespace Orchard.Core.Common.DataMigrations {
                 .Column<DateTime>("ModifiedUtc")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs

@@ -11,7 +11,7 @@ namespace Orchard.Core.Localization.DataMigrations {
                 .Column<int>("MasterContentItemId")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs

@@ -18,7 +18,7 @@ namespace Orchard.Core.Navigation.DataMigrations {
                 .Column<bool>("OnMainMenu")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Core/Reports/Module.txt

@@ -6,6 +6,6 @@ version: 0.5.0
 orchardversion: 0.5.0
 description: The dashboard module is providing the reports screen of the application.
 features:
-    Dashboard:
+    Reports:
         Description: Reports management.
         Category: Core

src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs

@@ -12,7 +12,7 @@ namespace Orchard.Core.Routable.DataMigrations {
                 .Column<string>("Path", column => column.WithLength(2048))
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Core/Scheduling/DataMigrations/SchedulingDataMigration.cs

@@ -13,7 +13,7 @@ namespace Orchard.Core.Scheduling.DataMigrations {
                 .Column<int>("ContentItemVersionRecord_id")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Core/Settings/DataMigrations/SettingsDataMigration.cs

@@ -91,7 +91,7 @@ namespace Orchard.Core.Settings.DataMigrations {
                 .Column<string>("SiteCulture")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs

@@ -17,7 +17,7 @@ namespace Futures.Widgets.DataMigrations {
                 .Column<int>("Scope_id")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs

@@ -20,7 +20,7 @@ namespace Orchard.Blogs.DataMigrations {
                 .Column<int>("PostCount")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs

@@ -41,7 +41,7 @@ namespace Orchard.Comments.DataMigrations {
                 .Column<bool>("CommentsActive")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/DataMigration.txt

@@ -7,7 +7,7 @@ namespace $$FeatureName$$.DataMigrations {
         public int Create() {
 $$Commands$$
 
-            return 0100;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Indexing/DataMigrations/IndexingDataMigration.cs

@@ -12,7 +12,7 @@ namespace Orchard.Indexing.DataMigrations {
                 .Column<int>("ContentItemRecord_id")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Media/DataMigrations/MediaDataMigration.cs

@@ -10,7 +10,7 @@ namespace Orchard.Media.DataMigrations {
                 .Column<string>("RootMediaFolder")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Modules/Commands/FeatureCommand.cs

@@ -1,14 +1,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using Orchard.Commands;
+using Orchard.UI.Notify;
 using Orchard.Utility.Extensions;
 
 namespace Orchard.Modules.Commands {
     public class FeatureCommand : DefaultOrchardCommandHandler {
         private readonly IModuleService _moduleService;
+        private readonly INotifier _notifier;
 
-        public FeatureCommand(IModuleService moduleService) {
+        public FeatureCommand(IModuleService moduleService, INotifier notifier) {
             _moduleService = moduleService;
+            _notifier = notifier;
         }
 
         [OrchardSwitch]
@@ -59,8 +62,10 @@ namespace Orchard.Modules.Commands {
                 }
             }
             if (featuresToEnable.Count != 0) {
-                _moduleService.EnableFeatures(featuresToEnable);
+                _moduleService.EnableFeatures(featuresToEnable, true);
-                Context.Output.WriteLine(T("Enabled features  {0}", string.Join(",", featuresToEnable)));
+                foreach(var entry in _notifier.List()) {
+                    Context.Output.WriteLine(entry.Message);    
+                }
             }
             else {
                 Context.Output.WriteLine(T("Could not enable features: {0}", string.Join(",", featureNames)));

src/Orchard.Web/Modules/Orchard.Roles/DataMigrations/RolesDataMigration.cs

@@ -33,7 +33,7 @@ namespace Orchard.Roles.DataMigrations {
                 .Column<int>("Role_id")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs

@@ -14,7 +14,7 @@ namespace Orchard.Sandbox.DataMigrations {
                 .Column<bool>("AllowAnonymousEdits")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Search/DataMigrations/SearchDataMigration.cs

@@ -11,7 +11,7 @@ namespace Orchard.Search.DataMigrations {
                 .Column<string>("SearchedFields")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Tags/DataMigrations/TagsDataMigration.cs

@@ -17,7 +17,7 @@ namespace Orchard.Tags.DataMigrations {
                 .Column<int>("ContentItemId")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Themes/DataMigrations/ThemesDataMigration.cs

@@ -22,7 +22,7 @@ namespace Orchard.Themes.DataMigrations {
                 .Column<string>("CurrentThemeName")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Users/DataMigrations/UsersDataMigration.cs

@@ -16,7 +16,7 @@ namespace Orchard.Users.DataMigrations {
                 .Column<string>("PasswordSalt")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }

src/Orchard/ContentManagement/DataMigrations/FrameworkDataMigration.cs

@@ -33,7 +33,7 @@ namespace Orchard.ContentManagement.DataMigrations {
                 .Column<string>("Culture")
                 );
 
-            return 0010;
+            return 1;
         }
     }
 }