michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,486 Commits 2 Branches 79 Tags 73 MiB
31aa6c486c
Commit Graph

13486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Rabert
6c2a34d173 Merge pull request #188 from Bond-009/rename 
Replace Emby with Jellyfin in the translations
 2018-12-15 16:15:28 -05:00
Joshua Boniface
595448e9b7 Merge branch 'master' into develop 
To include the hotfixes to master from last night.
 2018-12-15 15:23:21 -05:00
Bond_009
088da6c5e3 Replace Emby with Jellyfin in the translations 2018-12-15 20:13:25 +01:00
Bond_009
7792a9a9af Fix resource load crash 2018-12-15 16:33:20 +01:00
Joshua M. Boniface
8e9485867b Merge pull request #171 from nvllsvm/state 
State
 2018-12-15 00:19:31 -05:00
Andrew Rabert
bac06eea6e Adapt for Jellyfin 2018-12-15 00:17:53 -05:00
Andrew Rabert
d137977a6d Partial revert of 443356fd34c7b3377c41c1029c2973e9d61e0539 2018-12-15 00:17:07 -05:00
Andrew Rabert
e544a6e265 Merge pull request #169 from joshuaboniface/ffmpeg-timeout 
Restore timeout to 60s as it breaks
 2018-12-14 23:38:32 -05:00
Joshua Boniface
c3ade725dc Restore timeout to 60s as it breaks 2018-12-14 23:37:32 -05:00
Andrew Rabert
72619ddc5a Merge pull request #168 from joshuaboniface/ffmpeg-timeout 
Up the timerDuration back to 10s, 2s is too low
 2018-12-14 23:28:12 -05:00
Joshua Boniface
fda3f0ad9b Up the timerDuration back to 10s, 2s is too low 2018-12-14 23:04:19 -05:00
Andrew Rabert
67aa6dacb2 Merge pull request #167 from joshuaboniface/ffmpeg-timeout 
Lower the ffmpeg stop timeout duration
 2018-12-14 22:52:39 -05:00
Joshua Boniface
e5531c5c25 Lower the ffmpeg stop timeout duration 
As this was, ffmpeg would continue to transcode video for timerDuration
seconds after stopping playback (i.e. returning to the menu). However,
this 60s timeout was a little obnoxious. Tested a 100ms timeout but
this ended up causing playback to constantly terminate. 2s seems like
the sweet spot where playback works normally, but terminating quickly
on stop.
 2018-12-14 22:46:23 -05:00
Andrew Rabert
46c75d75bd Merge pull request #166 from jellyfin/develop 
Develop
 2018-12-14 21:28:12 -05:00
Joshua M. Boniface
a73d255f51 Enable self-contained binary mode (#160) 
* Build self-contained Debian linux-x64 binary

* Update initscripts to use self-contained binary

The binary is declared in the units intentionally rather than using
the variable extrapolation from before, to avoid confusion since
these can't really be moved reasonably.

* With combined binary name, use pgrep instead

* Remove dotnet-runtime dependency

* Move the compiled scb to usr/bin

* Update binary location for upstart/systemd

* Move binary path; fix pidfile handling

* Entirely remove the temporary usr/ dir

* Don't move the compiled binary

* Create /usr/bin symlink

* Use the variable here

* Update architecture to any

* Add libcurl4-openssl build dependency

* Update the build Dockerfile to install builddeps
 2018-12-14 21:21:48 -05:00
Joshua M. Boniface
72f7e7b954 Merge pull request #163 from nvllsvm/clnp 
cleanup
 2018-12-14 19:06:42 -05:00
Andrew Rabert
36c79c9491 cleanup 2018-12-14 19:00:19 -05:00
Andrew Rabert
8adeacb3a0 Merge pull request #146 from joshuaboniface/debian-packaging 
Add build script for Debian packages via Docker
 2018-12-14 18:58:44 -05:00
Joshua Boniface
0fec8f6493 Don't use errexit, explicitly exit on failures 2018-12-14 18:57:12 -05:00
Joshua Boniface
a7cdab9ae3 Remove errexit and cleanup on INT too 2018-12-14 18:43:50 -05:00
Joshua M. Boniface
c45cae0951 Merge pull request #158 from joshuaboniface/readme-tweaks 
Readme tweaks
 2018-12-14 18:21:57 -05:00
Joshua Boniface
d6b837c9fb Revamp contributing section to link to wiki 2018-12-14 18:20:48 -05:00
Andrew Rabert
81ba5acf7c Merge pull request #154 from MatMaul/mediaencoding 
Port MediaEncoding and Api.Playback
 2018-12-14 18:06:12 -05:00
Joshua M. Boniface
28a2774883 Merge pull request #159 from Bond-009/patch-1 
Fix changing ProgramDataPath when passed as and arg
 2018-12-14 16:59:25 -05:00
Bond-009
494c2e312d Fix changing ProgramDataPath when passed as and arg 2018-12-14 22:57:26 +01:00
Joshua Boniface
3694e6883b Remove contributing.md as it's in the Wiki now 2018-12-14 16:23:11 -05:00
Joshua Boniface
c883b43fce Add blurb about FFMPEG and Ubuntu 2018-12-14 16:02:12 -05:00
Joshua M. Boniface
afd6727c64 Merge pull request #140 from Bond-009/skia 
Remove some warnings for obsolete code.
 2018-12-14 14:06:36 -05:00
Joshua Boniface
26e44854f6 Add quoting and consistent variable calls 2018-12-14 13:47:04 -05:00
Bond_009
77eba9cc44 Address comments 2018-12-14 17:46:43 +01:00
Mathieu Velten
1d7d52ff9e Port MediaEncoding and Api.Playback from 10e57ce8d21b4516733894075001819f3cd6db6b 2018-12-14 17:32:54 +01:00
Anthony Lavado
75068407c6 Merge pull request #152 from agsimmons/patch-1 
Fix markdown formatting / typo
 2018-12-14 11:24:47 -05:00
Andrew Simmons
330a1df340 Fix markdown formatting 2018-12-14 09:31:12 -05:00
Joshua Boniface
f3ba806e4a Major script cleanups based on feedback 2018-12-14 01:03:17 -05:00
Andrew Rabert
d48f1ad3ae Merge pull request #147 from joshuaboniface/postinst-cleanup 
Clean up Debian postinst script
 2018-12-14 00:25:45 -05:00
Joshua Boniface
668d8b4891 Also bump Debian build version 2018-12-14 00:08:47 -05:00
Joshua Boniface
550ad72f93 Add Debian package build script for docker 2018-12-13 23:57:46 -05:00
Joshua Boniface
6a02df1603 Clean up /var/lib/emby after #97 2018-12-13 23:49:16 -05:00
Joshua M. Boniface
1f112c8a0c Merge pull request #126 from BnMcG/125-dlna-branding 
Remove Emby branding from DLNA server
 2018-12-13 23:23:08 -05:00
Andrew Rabert
e48cac9a87 Merge pull request #141 from nvllsvm/droneingon 
Drone CI changes
 2018-12-13 20:17:13 -05:00
Ben Magee
c58b3a0c47 Rebranded XML profiles 2018-12-14 00:02:55 +00:00
Andrew Rabert
bdc2655a78 Merge pull request #97 from Bond-009/home 
Move default data folder for *nix platforms to $XDG_DATA_HOME/jellyfin
 2018-12-13 18:44:39 -05:00
Andrew Rabert
b988a0644a Remove clone depth 
causing problems with revert commits
 2018-12-13 18:40:15 -05:00
Andrew Rabert
16e3c5eb85 Recursively init submodules 2018-12-13 18:40:01 -05:00
Bond_009
c189d31a2b Remove some warnings 2018-12-13 22:34:28 +01:00
Ben Magee
051c67a537 Updated strings to "Jellyfin Server" 2018-12-13 19:10:22 +00:00
Joshua M. Boniface
64805410c2 Merge pull request #136 from BnMcG/135-gitignore 
Ignore debian build artifacts
 2018-12-13 13:35:07 -05:00
Ben Magee
7fc03f8bf1 Whitespace fix 2018-12-13 18:31:35 +00:00
Ben Magee
fbedadbb44 Ignore debian build artifacts 2018-12-13 18:26:25 +00:00
Vasily
4790046ad8 Merge pull request #132 from joshuaboniface/debian-packaging 
Add maxcpucount to dotnet clean
 2018-12-13 20:41:48 +03:00