Go to file

Luke Pulverenti fd5f12e762 Merge branch 'master' into beta 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-14 16:34:47 -05:00
Emby.Drawing	use image magick for auto-orientation	2016-01-21 11:53:03 -05:00
MediaBrowser.Api	update smart match tab	2016-02-13 01:39:23 -05:00
MediaBrowser.Common	update upgrade process	2016-02-03 15:52:45 -05:00
MediaBrowser.Common.Implementations	add more play buttons	2016-02-12 15:26:03 -05:00
MediaBrowser.Controller	update search results	2016-02-14 12:58:31 -05:00
MediaBrowser.Dlna	fix dlna header parsing	2016-02-13 21:27:13 -05:00
MediaBrowser.LocalMetadata	support tagging 3d as mvc	2016-02-11 14:11:28 -05:00
MediaBrowser.MediaEncoding	support tagging 3d as mvc	2016-02-11 14:11:28 -05:00
MediaBrowser.Model	Auto-Organize - Feature to remember/persist series matching in manual organization dialog: Changed to match against plain library name inste	2016-02-12 21:42:10 +01:00
MediaBrowser.Model.net35	Auto-Organize: Added feature to remember/persist series matching in manual organization dialog #2	2016-02-05 05:21:25 +01:00
MediaBrowser.Model.Portable	Auto-Organize: Added feature to remember/persist series matching in manual organization dialog #2	2016-02-05 05:21:25 +01:00
MediaBrowser.Providers	update recording deletion process	2016-02-11 23:54:00 -05:00
MediaBrowser.Server.Implementations	update search results	2016-02-14 12:58:31 -05:00
MediaBrowser.Server.Mac	update mac project	2016-02-14 16:15:16 -05:00
MediaBrowser.Server.Mono	support system wake on recording schedule	2016-01-21 12:29:14 -05:00
MediaBrowser.Server.Startup.Common	update repository inheritance	2016-02-14 00:32:19 -05:00
MediaBrowser.ServerApplication	increase startup timeout	2016-02-03 12:26:45 -05:00
MediaBrowser.Tests	Ensure that all ssa tags are wiped out of srt subtitles	2015-08-17 22:39:55 -07:00
MediaBrowser.WebDashboard	update channel filters	2016-02-14 15:34:54 -05:00
MediaBrowser.XbmcMetadata	support tagging 3d as mvc	2016-02-11 14:11:28 -05:00
Nuget	update nuget	2016-01-24 14:39:24 -05:00
OpenSubtitlesHandler	update file system methods	2015-09-13 17:32:02 -04:00
.gitignore	add missing files	2015-07-16 09:06:02 -04:00
CONTRIBUTING.md	update uninstaller	2015-07-18 14:21:50 -04:00
CONTRIBUTORS.md	Add myself to the contributors	2014-06-09 20:46:00 +02:00
LICENSE.md	Create LICENSE.md	2013-08-29 17:47:14 -04:00
MediaBrowser.Mono.sln	update solution files	2015-12-19 11:02:47 -05:00
MediaBrowser.Mono.userprefs	update mono build	2014-07-09 10:39:04 -04:00
MediaBrowser.Server.Mac.sln	update solution files	2015-12-19 11:02:47 -05:00
MediaBrowser.Server.Mac.userprefs	update file system methods	2015-09-13 17:32:02 -04:00
MediaBrowser.sln	restore changes	2015-12-19 12:48:42 -05:00
MediaBrowser.sln.GhostDoc.xml	replace file system calls with IFileSystem when needed	2013-10-31 10:03:23 -04:00
README.md	update mac project	2016-02-01 22:14:35 -05:00
SharedVersion.cs	3.0.5877	2016-02-14 13:02:33 -05:00

README.md

Emby Server

Emby Server is a home media server built on top of other popular open source technologies such as Service Stack, jQuery, jQuery mobile, and Mono.

It features a REST-based API with built-in documention to facilitate client development. We also have client libraries for our API to enable rapid development.