diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-11 23:47:46 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-11 23:47:46 -0500 |
| commit | 57430424f48e230a0d0bb35e9980d94c2addafa3 (patch) | |
| tree | f48e8b6c6b010f4601052a61b4ed69922b36f9a6 | |
| parent | eac79359f24c77bb4cea4db29e2490136ac7bcb2 (diff) | |
| parent | ef03c5037268405da9671e1258e7033d6f8ecaf1 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
| -rw-r--r-- | MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj | 6 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj index 711b9dbd3..666eb1c10 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj @@ -618,6 +618,9 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\userprofiles.html">
<Link>Resources\dashboard-ui\userprofiles.html</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizardagreement.html">
+ <Link>Resources\dashboard-ui\wizardagreement.html</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizardfinish.html">
<Link>Resources\dashboard-ui\wizardfinish.html</Link>
</BundleResource>
@@ -1557,6 +1560,9 @@ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\userprofilespage.js">
<Link>Resources\dashboard-ui\scripts\userprofilespage.js</Link>
</BundleResource>
+ <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\wizardagreement.js">
+ <Link>Resources\dashboard-ui\scripts\wizardagreement.js</Link>
+ </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\wizardfinishpage.js">
<Link>Resources\dashboard-ui\scripts\wizardfinishpage.js</Link>
</BundleResource>
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index b94235673..89721f01b 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -90,6 +90,9 @@ <Content Include="dashboard-ui\css\images\server.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\css\images\tour\dashboard\help.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\forgotpasswordpin.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
|