lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aadd sync services tab

Browse Source
This commit is contained in:
Luke Pulverenti 2015-03-08 12:25:46 -04:00
parent 4389f47fb6
commit af0d1cada0
5 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
View File

@ -156,7 +156,12 @@ namespace MediaBrowser.Server.Implementations.Library
var list = new List<MediaSourceInfo>(); var list = new List<MediaSourceInfo>();
list.AddRange(mediaSources); list.AddRange(mediaSources);
list.AddRange(dynamicMediaSources);
foreach (var source in dynamicMediaSources)
{
source.SupportsTranscoding = false;
list.Add(source);
}
return SortMediaSources(list); return SortMediaSources(list);
} }
@ -273,7 +278,6 @@ namespace MediaBrowser.Server.Implementations.Library
.ToList(); .ToList();
} }
public MediaSourceInfo GetStaticMediaSource(IHasMediaSources item, string mediaSourceId, bool enablePathSubstitution) public MediaSourceInfo GetStaticMediaSource(IHasMediaSources item, string mediaSourceId, bool enablePathSubstitution)
{ {
return GetStaticMediaSources(item, enablePathSubstitution).FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase)); return GetStaticMediaSources(item, enablePathSubstitution).FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));

10
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -38,6 +38,16 @@
"ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.", "ErrorLaunchingChromecast": "There was an error launching chromecast. Please ensure your device is connected to your wireless network.",
"ValueTimeLimitSingleHour": "Time limit: 1 hour", "ValueTimeLimitSingleHour": "Time limit: 1 hour",
"ValueTimeLimitMultiHour": "Time limit: {0} hours", "ValueTimeLimitMultiHour": "Time limit: {0} hours",
"PluginCategoryGeneral": "General",
"PluginCategoryContentProvider": "Content Providers",
"PluginCategoryScreenSaver": "Screen Savers",
"PluginCategoryTheme": "Themes",
"PluginCategorySync": "Sync",
"PluginCategorySocialIntegration": "Social Networks",
"PluginCategoryNotifications": "Notifications",
"PluginCategoryMetadata": "Metadata",
"PluginCategoryLiveTV": "Live TV",
"PluginCategoryChannel": "Channels",
"HeaderSearch": "Search", "HeaderSearch": "Search",
"ValueDateCreated": "Date created: {0}", "ValueDateCreated": "Date created: {0}",
"LabelArtist": "Artist", "LabelArtist": "Artist",

3
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@ -61,6 +61,9 @@
"HeaderEasyPinCode": "Easy Pin Code", "HeaderEasyPinCode": "Easy Pin Code",
"HeaderGrownupsOnly": "Grown-ups Only!", "HeaderGrownupsOnly": "Grown-ups Only!",
"DividerOr": "-- or --", "DividerOr": "-- or --",
"HeaderInstalledServices": "Installed Services",
"HeaderAvailableServices": "Available Services",
"MessageNoServicesInstalled": "No services are currently installed.",
"HeaderToAccessPleaseEnterEasyPinCode": "To access, please enter your easy pin code", "HeaderToAccessPleaseEnterEasyPinCode": "To access, please enter your easy pin code",
"KidsModeAdultInstruction": "Click the lock icon in the bottom right to configure or leave kids mode. Your pin code will be required.", "KidsModeAdultInstruction": "Click the lock icon in the bottom right to configure or leave kids mode. Your pin code will be required.",
"ButtonConfigurePinCode": "Configure pin code", "ButtonConfigurePinCode": "Configure pin code",

1
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -366,6 +366,7 @@ namespace MediaBrowser.WebDashboard.Api
"backdrops.js", "backdrops.js",
"sync.js", "sync.js",
"syncjob.js", "syncjob.js",
"syncservices.js",
"playlistmanager.js", "playlistmanager.js",
"mediaplayer.js", "mediaplayer.js",

4
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -144,6 +144,7 @@
<Content Include="dashboard-ui\scripts\syncjob.js"> <Content Include="dashboard-ui\scripts\syncjob.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\scripts\syncservices.js" />
<Content Include="dashboard-ui\scripts\syncsettings.js"> <Content Include="dashboard-ui\scripts\syncsettings.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -165,6 +166,9 @@
<Content Include="dashboard-ui\syncjob.html"> <Content Include="dashboard-ui\syncjob.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\syncservices.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\syncsettings.html"> <Content Include="dashboard-ui\syncsettings.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>