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

13443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bond-009
d0fbd260d5
Merge branch 'master' into httpclient 2019-03-27 16:34:26 +01:00
Anthony Lavado
524357bfa8
Merge pull request #1157 from Bond-009/smallfix 
Simplify/remove/clean code
 2019-03-27 09:53:45 -04:00
Bond-009
7343e07fe5 Fix build error 2019-03-26 19:31:06 +01:00
Joshua M. Boniface
31607fbb37
Merge pull request #1153 from Bond-009/dlna 
Check if disposed first
 2019-03-25 20:08:11 -04:00
Bond-009
b44a70ff36 Simplify/remove/clean code 
* Remove useless runtime check (we only support one)
* Remove unused args
* Remove a global constant

And ofc fix some warnings ;)
 2019-03-25 22:25:32 +01:00
Bond-009
d623f616fa Improved dispose method 2019-03-25 17:32:27 +01:00
Bond-009
fc8de8aead Check if disposed first 2019-03-25 17:27:24 +01:00
Bond-009
5024c52c60
Merge pull request #1140 from oddstr13/pr-doxygen-1 
Add Doxygen config
 2019-03-24 13:26:56 +01:00
Bond-009
e971b62dab
Merge pull request #1137 from thornbill/fix-expires-header 
Fix default value for Expires header
 2019-03-24 13:25:41 +01:00
Odd Stråbø
16a3bb2df4 Implemented some requested changes to the Doxyfile 2019-03-21 18:21:07 +01:00
Odd Stråbø
2c684c0231 Customize Doxygen config. 2019-03-21 13:42:29 +01:00
Odd Stråbø
949a1cce21 Generate doxygen template config doxygen -g 2019-03-21 13:16:33 +01:00
Vasily
0e787f4e9f
Merge pull request #1139 from Liggy/debian-init 
Update init scripts for compatibility with Devuan
 2019-03-20 23:27:24 +03:00
Torsten
bd31091648 Update init scripts for compatibility with Devuan 
Include start, stop, restart and status option for /etc/init.d/jellyfin
Use start-stop-daemon to make the script refer to systemctl mechanism
on systems that have systemd installed
 2019-03-20 20:16:24 +01:00
Bill Thornton
4cd8903abc Fix default value for Expires header 2019-03-19 23:13:02 -04:00
Joshua M. Boniface
7b01de8db1
Merge pull request #1136 from jellyfin/add-access-to-template 
Require access type to be included in bug report
 2019-03-19 10:52:49 -04:00
Vasily
f73d8a44df
Improve the wording per @joshuaboniface suggestion 2019-03-19 17:37:56 +03:00
Vasily
752d65d020
Require access type to be included in bug report 
Inspired by https://github.com/jellyfin/jellyfin/issues/1085#issuecomment-473833591

It seems that the issue with "setup wizard" described there is only prominent when reverse-proxied, not when accessed directly. So this type of information should be gathered in the bug report as well.
 2019-03-19 17:13:27 +03:00
Joshua M. Boniface
c7e7aa0a61
Merge pull request #1117 from Bond-009/ffmpeg 
Check before flushing ffmpeg log
 2019-03-18 23:59:12 -04:00
Joshua M. Boniface
fc79659549
Merge pull request #1127 from LogicalPhallacy/lockoutfix 
Add configurable user lockout
 2019-03-18 21:13:51 -04:00
Vasily
e81a6adb95
Merge pull request #1090 from redSpoutnik/subtitle-display-title 
Set DisplayTitle for subtitles
 2019-03-17 09:36:35 +03:00
Phallacy
80aedcd7e2 really fixed line endings 2019-03-16 21:36:45 -07:00
Phallacy
fc28c9237c fixed line endings 2019-03-16 21:34:26 -07:00
Phallacy
b04200ca68 adding regex fix 2019-03-16 21:21:14 -07:00
Joshua M. Boniface
67fbbcfd12
Merge pull request #1121 from LogicalPhallacy/master 
Update username regex to string literal with escaped -
 2019-03-17 00:12:15 -04:00
Joshua M. Boniface
e3dbed1c1a
Update Emby.Server.Implementations/Library/UserManager.cs 
Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
 2019-03-16 10:16:23 -07:00
redSpoutnik
480a6607e2
Merge branch 'master' into subtitle-display-title 2019-03-16 17:54:57 +01:00
redSpoutnik
4a30fee40d Remove some dead code 2019-03-16 17:28:45 +01:00
Phallacy
7f0fa74467 updated regex to string literal with escaped - 2019-03-16 00:38:31 -07:00
Vasily
3d1d27230d
Merge pull request #1120 from LogicalPhallacy/master 
quick fix for auth bug
 2019-03-16 10:32:51 +03:00
LogicalPhallacy
9df1506794
Merge pull request #2 from LogicalPhallacy/master 
update lockoutfix to latest for testing
 2019-03-16 00:26:12 -07:00
LogicalPhallacy
2d0844b5db
Merge pull request #1 from jellyfin/master 
merging myself to latest
 2019-03-16 00:25:16 -07:00
Phallacy
1ee016c997 configurable user lockout 2019-03-16 00:18:52 -07:00
Phallacy
221389089c quick fix for auth bug 2019-03-15 21:25:19 -07:00
Joshua M. Boniface
59031ee3b8
Merge pull request #1119 from ploughpuff/503retry 
MusicBrainz 503 Retry Strategy
 2019-03-15 16:47:03 -04:00
PloughPuff
d2e408539e MusicBrainz 503 Retry Strategy 
Upon receiving back a 503 Service Unavailable from MusicBrainz (indicating throttling), retry the same request a number of times before giving up.
 2019-03-15 19:33:26 +00:00
Bond_009
a8140cc74b Merge branch 'master' of github.com:jellyfin/jellyfin into ffmpeg 2019-03-15 18:08:51 +01:00
Bond_009
d5f080fefb Check before flushing ffmpeg log 
The stream could have been diposed while writing.
 2019-03-15 17:58:34 +01:00
Joshua M. Boniface
35ff8ec713
Merge pull request #1116 from Bond-009/sub 
Fix exception caused by #1096
 2019-03-15 12:48:15 -04:00
Bond_009
764c901cd7 Fix exception caused by #1096 
```cs
MediaBrowser.Common.Extensions.ResourceNotFoundException: Configuration
with key subtitles not found.
   at
   Emby.Server.Implementations.AppBase.BaseConfigurationManager.<>c__DisplayClass42_0.<GetConfiguration>b__0(String
   k) in
   /home/pi/dev/jellyfin/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs:line
   247
      at
      System.Collections.Concurrent.ConcurrentDictionary`2.GetOrAdd(TKey
      key, Func`2 valueFactory)
         at
	 Emby.Server.Implementations.AppBase.BaseConfigurationManager.GetConfiguration(String
	 key) in
	 /home/pi/dev/jellyfin/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs:line
	 238
	    at
	    MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.AddExternalSubtitles(Video
	    video, List`1 currentStreams, MetadataRefreshOptions
	    options, CancellationToken cancellationToken) in
	    /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
	    486
	       at
	       MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.Fetch(Video
	       video, CancellationToken cancellationToken, MediaInfo
	       mediaInfo, BlurayDiscInfo blurayInfo,
	       MetadataRefreshOptions options) in
	       /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
	       204
	          at
		  MediaBrowser.Providers.MediaInfo.FFProbeVideoInfo.ProbeVideo[T](T
		  item, MetadataRefreshOptions options,
		  CancellationToken cancellationToken) in
		  /home/pi/dev/jellyfin/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs:line
		  119
		     at
		     MediaBrowser.Providers.Manager.MetadataService`2.RunCustomProvider(ICustomMetadataProvider`1
		     provider, TItemType item, String logName,
		     MetadataRefreshOptions options, RefreshResult
		     refreshResult, CancellationToken cancellationToken)
		     in
		     /home/pi/dev/jellyfin/MediaBrowser.Providers/Manager/MetadataService.cs:line
		     806

```
 2019-03-15 17:34:15 +01:00
Andrew Rabert
f85d45d17f
Merge pull request #1115 from SuperSandro2000/patch-2 
Clean apt lists in arm Dockerfiles
 2019-03-15 10:53:10 -04:00
Andrew Rabert
022bd1b8b4
Merge pull request #1114 from SuperSandro2000/patch-1 
Only remove /var/lib/apt/lists/* in Dockerfile
 2019-03-15 10:53:00 -04:00
Sandro Jäckel
31305af7ff
Clean apt lists in arm Dockerfiles 2019-03-15 14:39:23 +01:00
Sandro Jäckel
dd929d796f
Only remove /var/lib/apt/lists/* 2019-03-15 14:30:15 +01:00
Vasily
11fde02035
Merge pull request #1105 from ploughpuff/ratelimit 
Only delay making MusicBrainz request if necessary
 2019-03-15 16:01:55 +03:00
Joshua M. Boniface
3d85014edc
Merge pull request #1110 from EraYaN/productname-and-ua 
Adjusted the Product Name so the User Agent is correct/better.
 2019-03-15 00:25:38 -04:00
PloughPuff
d125fbc43d Added contact email to user agent 
MusicBrainz request a contact email address is supplied in comment section of user agent field.
 2019-03-14 21:34:09 +00:00
redSpoutnik
427688a0a0 Change subtitles DisplayTitle behavior 2019-03-14 22:31:51 +01:00
Erwin de Haan
21cc38fcf4 Adjusted AssemblyCopyright attribute values. 2019-03-14 22:17:56 +01:00
Erwin de Haan
ee7bf86e0f Adjusted the Product Name so the User Agent is correct/better. 2019-03-14 22:11:47 +01:00