lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,466 Commits 2 Branches 0 Tags 64 MiB
73a9079ee2
Commit Graph

1154 Commits

Author SHA1 Message Date
Bond-009
73a9079ee2
Merge branch 'master' into httpclient 2019-03-27 19:43:02 +01:00
Joshua M. Boniface
cc2edc4d66
Merge pull request #1151 from Phlogi/patch-1 
Use public ports and advertise DNS if available for WAN address
 2019-03-27 13:54:14 -04:00
Bond-009
d0fbd260d5
Merge branch 'master' into httpclient 2019-03-27 16:34:26 +01:00
Phlogi
122cba2aa7
Correct use of local variable wanAddress. 2019-03-25 22:26:05 +01: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
Phlogi
1b03f078b9
No need to assign empty string. 2019-03-25 21:43:50 +01:00
Phlogi
4c8f8cf64c
Removed trailing spaces, renamed get wan IP function. 2019-03-25 21:34:55 +01:00
Claus Vium
6480cfcc87
Formatting update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:19:08 +01:00
Claus Vium
e36d424b5f
Formatting update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:18:47 +01:00
Claus Vium
f7e7d72688
Formatting update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:18:18 +01:00
Claus Vium
3474568ce2
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:18:04 +01:00
Claus Vium
89f2dfd78a
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:17:53 +01:00
Claus Vium
2c4c56d6d6
Formatting update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:17:40 +01:00
Phlogi
087d4153ae
Fix check for available WAN address. 2019-03-24 21:47:18 +01:00
Phlogi
fb7f29de18
Format the WAN API Url correctly with https and Port. 2019-03-24 18:33:21 +01:00
Phlogi
d18252542d
Also add the WAN switch to the public system info. 2019-03-24 17:11:21 +01:00
Phlogi
030fcaac15
Proper access to configuration objects 2019-03-24 17:02:03 +01:00
Phlogi
7ebb043249
Removed comment, renamed methods consistently. 2019-03-24 16:50:39 +01:00
Claus Vium
598b1c9966
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-24 16:47:59 +01:00
Claus Vium
cf36aaef2b
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-24 16:47:48 +01:00
Claus Vium
f30af9cd5f
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-24 16:47:42 +01:00
Phlogi
4ffec8ad26
Fix build, missing changes. 2019-03-24 12:19:10 +01:00
Phlogi
69cc5814d8
Change WAN IP behaviour: Use ServerConfiguration.WanDdns if set in configuration. 2019-03-24 12:11:46 +01:00
Phlogi
414a318a0d
WAN Address should use public ports instead of local ports. 
https://github.com/jellyfin/jellyfin/issues/601#issuecomment-475941080
 2019-03-24 11:59:40 +01:00
Bill Thornton
4cd8903abc Fix default value for Expires header 2019-03-19 23:13:02 -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
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
Phallacy
7f0fa74467 updated regex to string literal with escaped - 2019-03-16 00:38:31 -07: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
Vasily
11fde02035
Merge pull request #1105 from ploughpuff/ratelimit 
Only delay making MusicBrainz request if necessary
 2019-03-15 16:01:55 +03: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
Vasily
208585d3f6
Merge pull request #1106 from Bond-009/warn2 
More warning fixes
 2019-03-14 19:54:44 +03:00
Bond-009
bf43dc00bb More warning fixes 2019-03-13 22:32:52 +01:00
Bond-009
e64aaebbac Improvements around streams 
* Use ArrayPool instead of allocating new buffers each time
* Remove NetworkStream copy
* Remove some dead code
 2019-03-13 21:11:01 +01:00
Vasily
605bf0e8c3
Merge pull request #1100 from ploughpuff/rmprobeswitch 
Finalise removal of --ffprobe switch
 2019-03-13 01:42:07 +03:00
Vasily
89e2af6b57
Merge pull request #1096 from dkanada/opensubs 
Remove open subtitles from the server
 2019-03-13 01:22:55 +03:00
PloughPuff
b864e9da2a Finalise removal of --ffprobe switch 
Removed --ffprobe from src files and server/docker scripts.
 2019-03-12 22:09:18 +00:00
Vasily
297f25cfc2
Merge pull request #1059 from Bond-009/os 
Remove EnvironmentInfo
 2019-03-13 00:01:00 +03:00
Joshua M. Boniface
6751560228
Merge pull request #1092 from joshuaboniface/configurable-webdir 
Add configurable webdir option
 2019-03-12 12:51:11 -04:00
Bond-009
3ddbda9aca
Merge branch 'master' into xml 2019-03-12 16:37:18 +01:00