Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

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",

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>