aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-16Merge pull request #1472 from MediaBrowser/betaLuke
Beta
2016-02-16restore changeLuke Pulverenti
2016-02-16fix merge conflictLuke Pulverenti
2016-02-16update photo album imagesLuke Pulverenti
2016-02-163.0.5871Luke Pulverenti
2016-02-163.0.5880Luke Pulverenti
2016-02-16Merge branch 'master' of https://github.com/MediaBrowser/EmbyLuke Pulverenti
2016-02-16Merge pull request #1469 from MediaBrowser/betaLuke
Beta
2016-02-16restore changesLuke Pulverenti
2016-02-16Merge branch 'master' of https://github.com/MediaBrowser/EmbyLuke Pulverenti
2016-02-16Merge pull request #1468 from MediaBrowser/devLuke
Dev
2016-02-16fix merge conflictLuke Pulverenti
2016-02-16fix xbox one, ps4 not seeing dlna serverLuke Pulverenti
2016-02-16update libsLuke Pulverenti
2016-02-16enable shared componentsLuke Pulverenti
2016-02-15update recordingsLuke Pulverenti
2016-02-153.0.5879Luke Pulverenti
2016-02-15Merge pull request #1467 from MediaBrowser/devLuke
merge from dev
2016-02-15update linux ffmpegLuke Pulverenti
2016-02-15update music filtersLuke Pulverenti
2016-02-15update episode filtersLuke Pulverenti
2016-02-15update game filtersLuke Pulverenti
2016-02-15stub out sat/ip discoveryLuke Pulverenti
2016-02-143.0.5870Luke Pulverenti
2016-02-14Merge pull request #1465 from MediaBrowser/betaLuke
Beta
2016-02-14Merge pull request #1464 from MediaBrowser/devLuke
update migration process
2016-02-14update migration processLuke Pulverenti
2016-02-143.0.5868Luke Pulverenti
2016-02-14Merge pull request #1463 from MediaBrowser/betaLuke
Beta
2016-02-14Merge branch 'beta' of https://github.com/MediaBrowser/Emby into betaLuke Pulverenti
2016-02-14Merge pull request #1462 from MediaBrowser/devLuke
merge from dev
2016-02-143.0.5878Luke Pulverenti
2016-02-14Merge branch 'beta' of https://github.com/MediaBrowser/Emby into betaLuke Pulverenti
2016-02-14fix merge conflictLuke Pulverenti
2016-02-14update upcomingLuke Pulverenti
2016-02-14remove duplicate queryLuke Pulverenti
2016-02-14fixes #1461 - DLNA Info SpamLuke Pulverenti
2016-02-14Merge branch 'dev' of https://github.com/MediaBrowser/Emby into devLuke Pulverenti
2016-02-14Merge branch 'dev' of https://github.com/MediaBrowser/Emby into devLuke Pulverenti
2016-02-14Merge pull request #1460 from MediaBrowser/masterLuke
update mac project
2016-02-14Merge pull request #1459 from MediaBrowser/masterLuke
update mac project
2016-02-14update mac projectLuke
2016-02-14remove duplicate referenceLuke Pulverenti
2016-02-14restore versionLuke Pulverenti
2016-02-14Merge pull request #1458 from MediaBrowser/masterLuke
merge from master
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