Merge branch 'develop' of https://github.com/mattman86/Lidarr into develop

src/NzbDrone.Core/Datastore/Migration/112_Add_music_fields_to_NamingConfig.cs

@@ -0,0 +1,15 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(112)]
+    public class add_music_fields_to_namingconfig : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("NamingConfig").AddColumn("ArtistFolderFormat").AsAnsiString().Nullable();
+            Alter.Table("NamingConfig").AddColumn("AlbumFolderFormat").AsAnsiString().Nullable();
+        }
+    }
+}

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -288,6 +288,7 @@
     </Compile>
     <Compile Include="Datastore\Migration\105_rename_torrent_downloadstation.cs" />
     <Compile Include="Datastore\Migration\111_setup_music.cs" />
+    <Compile Include="Datastore\Migration\112_add_music_fields_to_namingconfig.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationDbFactory.cs" />

src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using NLog;
 using NzbDrone.Common;
@@ -30,7 +30,7 @@ namespace NzbDrone.Update.UpdateEngine
 
         public void Start(AppType appType, string installationFolder)
         {
-            _logger.Info("Starting NzbDrone");
+            _logger.Info("Starting Lidarr");
             if (appType == AppType.Service)
             {
                 try
@@ -40,7 +40,7 @@ namespace NzbDrone.Update.UpdateEngine
                 }
                 catch (InvalidOperationException e)
                 {
-                    _logger.Warn(e, "Couldn't start NzbDrone Service (Most likely due to permission issues). falling back to console.");
+                    _logger.Warn(e, "Couldn't start Lidarr Service (Most likely due to permission issues). falling back to console.");
                     StartConsole(installationFolder);
                 }
             }
@@ -56,18 +56,18 @@ namespace NzbDrone.Update.UpdateEngine
 
         private void StartService()
         {
-            _logger.Info("Starting NzbDrone service");
+            _logger.Info("Starting Lidarr service");
             _serviceProvider.Start(ServiceProvider.NZBDRONE_SERVICE_NAME);
         }
 
         private void StartWinform(string installationFolder)
         {
-            Start(installationFolder, "NzbDrone.exe");
+            Start(installationFolder, "Lidarr.exe");
         }
 
         private void StartConsole(string installationFolder)
         {
-            Start(installationFolder, "NzbDrone.Console.exe");
+            Start(installationFolder, "Lidarr.Console.exe");
         }
 
         private void Start(string installationFolder, string fileName)

src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs

@@ -17,6 +17,13 @@
         <dt>Source</dt>
         <dd><a href="https://github.com/mattman86/Lidarr/">github.com/Lidarr/Lidarr</a></dd>
 
+        <dt>Contributors</dt>
+        <dd>DB and API - <a href="https://github.com/majora2007">Majora2007</a></dd>
+        <dd>UI and Website - <a href="https://github.com/mattman86">Mattman86</a></dd>
+        <dd>UI and Logo - <a href="https://github.com/skoden">Skoden</a></dd>
+        <dd>DB and Search - <a href="https://github.com/runraid">Runraid</a></dd>
+        <dd>Consultation - <a href="https://github.com/galli-leo">Galli-leo</a></dd>
+
         <dt>Feature Requests</dt>
         <dd><a href="http://feathub.com/mattman86/Lidarr/">feathub.com/mattman86/Lidarr</a></dd>
         <dd><a href="https://github.com/mattman86/Lidarr/issues">github.com/mattman86/Lidarr/issues</a> <b>(Please post issues on the forum first and not on github)</b></dd>