Go to file
Erwin de Haan 49b61f238e Merge branch 'dev' into reformat
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
2019-01-15 17:34:39 +01:00
.github Delete CODEOWNERS from dev branch 2019-01-12 16:10:51 -05:00
.vscode Add JSON assets for VSCode development 2019-01-02 02:20:14 -05:00
BDInfo ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
deployment Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
DvdLib ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Emby.Dlna ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Emby.Drawing Merge branch 'dev' into reformat 2019-01-13 21:59:37 +01:00
Emby.Drawing.Skia ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Emby.IsoMounting ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Emby.Naming ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Emby.Notifications Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
Emby.Photos ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Emby.Server.Implementations Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
Emby.XmlTv ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Jellyfin.Server Merge branch 'dev' into reformat 2019-01-13 21:59:37 +01:00
MediaBrowser.Api Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
MediaBrowser.Common Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
MediaBrowser.Controller ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
MediaBrowser.LocalMetadata ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
MediaBrowser.MediaEncoding ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
MediaBrowser.Model Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
MediaBrowser.Providers ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
MediaBrowser.Tests Updated MediaBrowser.Tests AssemblyInfo.cs 2019-01-14 08:32:31 +01:00
MediaBrowser.WebDashboard Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
MediaBrowser.XbmcMetadata ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Mono.Nat ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
OpenSubtitlesHandler ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
RSSDP Merge branch 'dev' into reformat 2019-01-13 21:59:37 +01:00
SocketHttpListener ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
.dockerignore Build scripts and build system consolidation. 2019-01-10 19:45:30 +01:00
.drone.yml Pull in change from build system, to fix the drone build once and for all. 2019-01-13 16:32:54 +01:00
.editorconfig Mayor code cleanup 2019-01-10 20:38:53 +01:00
.gitattributes Add merge=union for CONTRIBUTORS.md 2018-12-29 19:35:42 -05:00
.gitignore Added git submodules command. Converted RPM to build from local tree. Added all the execution bits to the build scripts. 2019-01-12 01:49:46 +01:00
.gitmodules add jellyfin-web as submodule 2019-01-09 23:35:05 +09:00
CONTRIBUTORS.md Add cvium to CONTRIBUTORS 2019-01-15 16:48:21 +01:00
Dockerfile Merge remote-tracking branch 'upstream/dev' into build-system-consolidation 2019-01-13 23:28:05 +01:00
Dockerfile.arm Merged the two ARM platforms. To be split apart when a binary ffmpeg is required. 2019-01-13 23:43:12 +01:00
jellyfin.code-workspace EditorConfig reformat: Non-CS files. 2019-01-13 20:45:51 +01:00
LICENSE Remove incorrect .md suffix from LICENSE file 2018-12-09 18:02:44 -05:00
MediaBrowser.sln Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
MediaBrowser.sln.GhostDoc.xml EditorConfig reformat: Non-CS files. 2019-01-13 20:45:51 +01:00
new-file-header.txt Add a better wording here 2018-12-28 19:29:07 -05:00
README.md Update readme to use readthedocs and clean up 2019-01-06 16:10:41 -05:00
SharedVersion.cs Mayor code cleanup 2019-01-10 20:38:53 +01:00

Jellyfin

The Free Software Media System


Logo banner

GPL 2.0 License Build Status Docker Pull Count Documentation Chat on Matrix Join our Subreddit


Jellyfin is a Free Software Media System that puts you in control of managing and streaming your media. It is an alternative to the proprietary Emby and Plex, to provide media from a dedicated server to end-user devices via multiple apps. Jellyfin is descended from Emby's 3.5.2 release and ported to the .NET Core framework to enable full cross-platform support. There are no strings attached, no premium licenses or features, and no hidden agendas: just a team who want to build something better and work together to achieve it. We welcome anyone who is interested in joining us in our quest!

For further details, please see our documentation page. To receive the latest updates, get help with Jellyfin, and join the community, please visit one of our communication channels on Matrix/Riot or social media.

For more information about the project, please see our about page.

Want to get started? Choose from Prebuilt Packages or Build from Source, then see our Quickstart guide.

Want to contribute? Check out our documentation for guidelines.

New idea or improvement? Something not working right? Open an Issue.