michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1473 from t-andre/dev

Browse Source 
Update voice components
This commit is contained in:
Luke 2016-02-23 11:57:15 -05:00
commit cb4b3b3870
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -466,12 +466,6 @@
<Content Include="dashboard-ui\components\tvproviders\schedulesdirect.template.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\textprocessor-en-us.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\voice.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\dashboardhosting.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -550,9 +544,6 @@
<Content Include="dashboard-ui\scripts\userpassword.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\voice.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\wizardagreement.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -1402,6 +1393,17 @@
<Content Include="dashboard-ui\userpassword.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\voice\commands\controlcommands.js" />
<Content Include="dashboard-ui\voice\commands\disablecommands.js" />
<Content Include="dashboard-ui\voice\commands\enablecommands.js" />
<Content Include="dashboard-ui\voice\commands\playcommands.js" />
<Content Include="dashboard-ui\voice\commands\searchcommands.js" />
<Content Include="dashboard-ui\voice\commands\showcommands.js" />
<Content Include="dashboard-ui\voice\commands\togglecommands.js" />
<Content Include="dashboard-ui\voice\grammarprocessor.js" />
<Content Include="dashboard-ui\voice\voice.css" />
<Content Include="dashboard-ui\voice\voice.js" />
<Content Include="dashboard-ui\voice\voicecommands.js" />
<Content Include="dashboard-ui\wizardagreement.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -2232,6 +2234,9 @@
</None>
<None Include="dashboard-ui\thirdparty\social-share-kit-1.0.4\LICENSE" />
<None Include="dashboard-ui\thirdparty\social-share-kit-1.0.4\README.md" />
<None Include="dashboard-ui\voice\grammar\en-US.json" />
<None Include="dashboard-ui\voice\grammar\grammar.json" />
<None Include="dashboard-ui\voice\Readme.md" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />

7
MediaBrowser.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F0E0E64C-2A6F-4E35-9533-D53AC07C2CD1}"
EndProject
@ -521,7 +521,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal