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

Merge pull request #1542 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-03-10 23:37:39 -05:00
commit 11c67d886b
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Api/Images/ImageService.cs
View File

@ -699,6 +699,7 @@ namespace MediaBrowser.Api.Images
private ImageFormat[] GetClientSupportedFormats()
{
//Logger.Debug("Request types: {0}", string.Join(",", Request.AcceptTypes ?? new string[] { }));
var supportsWebP = (Request.AcceptTypes ?? new string[] { }).Contains("image/webp", StringComparer.OrdinalIgnoreCase);
var userAgent = Request.UserAgent ?? string.Empty;

2
MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
View File

@ -547,7 +547,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
if (series == null)
{
SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(e => e.MatchStrings.Contains(seriesName, StringComparer.OrdinalIgnoreCase));
SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(e => e.MatchStrings.Contains(nameWithoutYear, StringComparer.OrdinalIgnoreCase));
if (info != null)
{

3
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -354,6 +354,9 @@ namespace MediaBrowser.WebDashboard.Api
DeleteFoldersByName(Path.Combine(bowerPath, "Sortable"), "meteor");
DeleteFoldersByName(Path.Combine(bowerPath, "Sortable"), "st");
DeleteFoldersByName(Path.Combine(bowerPath, "Swiper"), "src");
DeleteFoldersByName(Path.Combine(bowerPath, "material-design-lite"), "src");
DeleteFoldersByName(Path.Combine(bowerPath, "material-design-lite"), "utils");
_fileSystem.DeleteFile(Path.Combine(bowerPath, "material-design-lite", "gulpfile.babel.js"));
_fileSystem.DeleteDirectory(Path.Combine(bowerPath, "marked"), true);
_fileSystem.DeleteDirectory(Path.Combine(bowerPath, "marked-element"), true);

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

@ -436,14 +436,7 @@ namespace MediaBrowser.WebDashboard.Api
var files = new List<string>();
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
{
files.Add("bower_components/requirejs/require.js");
}
else
{
files.Add("bower_components" + version + "/requirejs/require.js");
}
files.Add("bower_components/requirejs/require.js");
files.Add("scripts/site.js" + versionString);