aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-05-27 10:16:16 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-05-27 10:16:16 -0400
commit8c0388df6b6bb88c132b204389e97f78c37c483c (patch)
tree8664e73a050fe65876947b22f3409e8926ed01f0
parent96a51431f2eef4bee98c11652e0bb6b0c96c8ed8 (diff)
parent11ed8649d2ba954941e5b00283cd67cc6eb357f2 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--MediaBrowser.WebDashboard/Api/DashboardService.cs1
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj6
2 files changed, 7 insertions, 0 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index cddf247ee..f96d5e601 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -609,6 +609,7 @@ namespace MediaBrowser.WebDashboard.Api
"mypreferenceswebclient.js",
"notifications.js",
+ "notificationlist.js",
"notificationsetting.js",
"notificationsettings.js",
"playlist.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 84e9645c2..2070ad03f 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -334,6 +334,9 @@
<Content Include="dashboard-ui\mypreferenceswebclient.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\notificationlist.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\reports.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -664,6 +667,9 @@
<Content Include="dashboard-ui\scripts\mypreferenceswebclient.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\scripts\notificationlist.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\scripts\reports.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>