Merge branch 'markus101'

14 years ago · 5ab104dec6
parent 0d02b0538b 00b1e4bb12
commit 5ab104dec6
2 changed files with 2 additions and 1 deletions
--- a/NzbDrone.Core.Test/SabProviderTest.cs
+++ b/NzbDrone.Core.Test/SabProviderTest.cs
@ -53,7 +53,7 @@ namespace NzbDrone.Core.Test
                .Setup(
                    s =>
                    s.DownloadString(
-                        "http://192.168.5.55:2222/api?mode=addurl&name=http://www.nzbclub.com/nzb_download.aspx?mid=1950232&priority=0&cat=tv&nzbname=This+is+an+Nzb&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
+                        "http://192.168.5.55:2222/api?mode=addurl&name=http://www.nzbclub.com/nzb_download.aspx?mid=1950232&priority=0&pp=3&cat=tv&nzbname=This+is+an+Nzb&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
                .Returns("ok");

            //Act
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@ -648,6 +648,7 @@
    <Content Include="Scripts\2011.1.315\telerik.treeview.min.js" />
    <Content Include="Scripts\2011.1.315\telerik.upload.min.js" />
    <Content Include="Scripts\2011.1.315\telerik.window.min.js" />
+    <Content Include="Scripts\gridLoad.js" />
    <Content Include="Scripts\jquery-1.5.2-vsdoc.js" />
    <Content Include="Scripts\jquery-1.5.2.js" />
    <Content Include="Scripts\jquery-1.5.2.min.js" />