aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-08 17:05:11 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-04-08 17:05:11 -0400
commitbbda91a228a5834581883a1a92edfc6044e3a6c6 (patch)
tree78f1ee1da94cb42148ec418b8c10d614554cb517
parenta55ffea7a1dbe0c2ba24759f22b4f2ec4412d3bb (diff)
parentb1cc7ccaff8073a5d50287f6db6f78bdd1f4835d (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs3
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj3
2 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 7c3de72fe..b0f03f96b 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -517,7 +517,8 @@ namespace MediaBrowser.WebDashboard.Api
"wizardstartpage.js",
"wizarduserpage.js",
"supporterkeypage.js",
- "supporterpage.js"
+ "supporterpage.js",
+ "playlist.js"
};
var memoryStream = new MemoryStream();
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 12ed0f7c7..edf0f884d 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -213,6 +213,9 @@
<Content Include="dashboard-ui\scripts\itembynamedetailpage.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\scripts\playlist.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\scripts\librarybrowser.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>