aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-14restore versionLuke Pulverenti
2016-02-14Merge pull request #1457 from MediaBrowser/masterLuke
merge from master
2016-02-143.0.5867Luke Pulverenti
2016-02-14Merge branch 'beta'Luke Pulverenti
2016-02-14Merge branch 'master' into betaLuke Pulverenti
Conflicts: MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj MediaBrowser.Server.Implementations/packages.config MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/test/iron-menubar-behavior.html MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-pages/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-pages/bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/CONTRIBUTING.md MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/marked-element.html MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/test/index.html MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/test/marked-element.html MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/CHANGELOG.md MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/LICENSE MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-core.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-core.min.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-jsx.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-jsx.min.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/package.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/file-highlight/prism-file-highlight.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/file-highlight/prism-file-highlight.min.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.css MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.min.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.css MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.min.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/wpd/prism-wpd.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/wpd/prism-wpd.min.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/prism.js MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-coy.css MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-dark.css MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-funky.css MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-okaidia.css MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-tomorrow.css MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-twilight.css MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism.css SharedVersion.cs packages/MediaBrowser.Naming.1.0.0.47/lib/portable-net45+sl4+wp71+win8+wpa81/MediaBrowser.Naming.dll
2016-02-14update mac projectLuke Pulverenti
2016-02-14Merge pull request #1455 from MediaBrowser/devLuke
Dev
2016-02-14update channel filtersLuke Pulverenti
2016-02-14Merge branch 'beta' of https://github.com/MediaBrowser/Emby into betaLuke Pulverenti
2016-02-143.0.5877Luke Pulverenti
2016-02-14Merge pull request #1453 from MediaBrowser/devLuke
update search results
2016-02-14update search resultsLuke Pulverenti
2016-02-143.0.5876Luke Pulverenti
2016-02-14Merge pull request #1452 from MediaBrowser/devLuke
Dev
2016-02-14update repository inheritanceLuke Pulverenti
2016-02-14restore people in searchLuke Pulverenti
2016-02-13auto-queue episodesLuke Pulverenti
2016-02-13fix dlna header parsingLuke Pulverenti
2016-02-133.0.5875Luke Pulverenti
2016-02-13Merge pull request #1451 from MediaBrowser/devLuke
Dev
2016-02-13update recorderLuke Pulverenti
2016-02-13increase message countLuke Pulverenti
2016-02-13add unicast supportLuke Pulverenti
2016-02-133.0.5874Luke Pulverenti
2016-02-13Merge pull request #1450 from MediaBrowser/devLuke
Dev
2016-02-13update smart match tabLuke Pulverenti
2016-02-13update delete smart match entryLuke Pulverenti
2016-02-12Merge pull request #1449 from softworkz/OrganizeDialogAsComponentLuke
Organizedialogascomponent
2016-02-123.0.5873Luke Pulverenti
2016-02-12Merge pull request #1448 from MediaBrowser/devLuke
Dev
2016-02-13Refactored organization dialog as a componentsoftworkz
2016-02-12Merge pull request #1435 from softworkz/SeriesDetectionV2Luke
Auto-Organize - Feature to remember/persist series matching in manual organization dialog: Changed to match against plain library name instead of library item GUID.
2016-02-12use ignorecaseLuke Pulverenti
2016-02-12Auto-Organize - Feature to remember/persist series matching in manual ↵softworkz
organization dialog: Changed to match against plain library name inste
2016-02-12add more play buttonsLuke Pulverenti
2016-02-123.0.5872Luke Pulverenti
2016-02-12Merge pull request #1447 from MediaBrowser/devLuke
Dev
2016-02-12update recording creationLuke Pulverenti
2016-02-12update recording creation processLuke Pulverenti
2016-02-123.0.5871Luke Pulverenti
2016-02-12Merge pull request #1446 from MediaBrowser/devLuke
update config page
2016-02-12Merge pull request #1445 from MediaBrowser/devLuke
add recording encoding setting
2016-02-12add recording encoding settingLuke Pulverenti
2016-02-11Merge pull request #1444 from MediaBrowser/devLuke
Dev
2016-02-11update recording deletion processLuke Pulverenti
2016-02-11update config pagesLuke Pulverenti
2016-02-11Merge pull request #1443 from MediaBrowser/devLuke
fix GetOtherDuplicatePaths
2016-02-11fix GetOtherDuplicatePathsLuke Pulverenti
2016-02-11Merge pull request #1442 from MediaBrowser/devLuke
Dev
2016-02-11support tagging 3d as mvcLuke Pulverenti