diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-29 22:00:48 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-04-29 22:00:48 -0400 |
| commit | 93ad0e469ca48a940364e78c94a579212bc52dc4 (patch) | |
| tree | b49072ac45c28a0d4651ebff196f0d5860c0a990 | |
| parent | f95d2cc5067463642e395a435a13a72b7abd8185 (diff) | |
| parent | 59ca19b08c8f03650ee09158d402634a6d7f037a (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/DashboardService.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index b6fea5a4c..e2c18760b 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -422,6 +422,7 @@ namespace MediaBrowser.WebDashboard.Api "http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js", "http://code.jquery.com/mobile/1.3.1/jquery.mobile-1.3.1.min.js", "thirdparty/video-js-3.2.0/video.min.js", + "thirdparty/autoNumeric.js", "scripts/all.js" + versionString }; diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 19727fa9c..bc33a7cbe 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -377,6 +377,9 @@ <Content Include="dashboard-ui\scripts\videojsextensions.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\thirdparty\autoNumeric.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\thirdparty\video-js-3.2.0\demo.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
|