lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,053 Commits 2 Branches 0 Tags 64 MiB
d9be3874ba
Commit Graph

715 Commits

Author SHA1 Message Date
1hitsong
d9be3874ba Auto stash before merge of "lyric-lrc-file-support" and "origin/lyric-lrc-file-support" 2022-09-15 19:45:26 -04:00
Jamie Introcaso
c0dae0fef5 Adds lyric providers to DI pipeline 
This is adding those lyric providers to the DI pipeline along with a super simple implementation of how to use them in the controller method. Probably should be refactored into a lyric service of some sort that would have the providers injected into it.
 2022-09-14 20:39:35 -04:00
Joshua Boniface
38eefbbafa Backport pull request #8087 from jellyfin/release-10.8.z 
feat: make subtitleeditparser generic

Authored-by: Claus Vium <cvium@users.noreply.github.com>

Merged-by: Bond-009 <bond.009@outlook.com>

Original-merge: 7323ccfc232d31797af3ceb8bad93cae1ea0898d
 2022-08-01 14:25:42 -04:00
Joshua Boniface
410871e148 Backport pull request #7732 from jellyfin/release-10.8.z 
Fix to make web sockets close gracefully on server shutdown

Authored-by: luke brown <luke92brown@gmail.com>

Merged-by: Cody Robibero <cody@robibe.ro>

Original-merge: ee22feb89a34632a4cc3a350733dd57c6be863ec
 2022-07-24 12:35:46 -04:00
Cody Robibero
a99e87a00c Merge pull request #7954 from cvium/fix_7953_dlna_url 
(cherry picked from commit 2c0c3eb3ee6eabdf1d2c94619f094f711870f820)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
 2022-06-29 01:26:15 -04:00
Bond_009
5732e6188c Fix some warnings 2022-02-15 18:59:46 +01:00
Bond_009
3cb49d6df0 Fix option to disable server discovery 2022-02-14 14:39:33 +01:00
Cody Robibero
34ee6d82fb
Merge pull request #6600 from cvium/keyframe_extraction_v1 2022-01-20 08:54:40 -07:00
cvium
6ffa9539bb Refactor and add scheduled task 2022-01-11 23:30:30 +01:00
Joe Rogers
1dfbeae045
Embed ProviderUtils into MetadataService 2022-01-04 00:44:03 +01:00
Bond_009
cbfa355e31 Update StyleCop 2021-12-24 18:28:27 +01:00
cvium
69df004b9f Migrate network configuration safely 2021-11-24 13:00:12 +01:00
cvium
a263f3978b Only force scheme and port when HTTPS is disallowed 2021-11-19 16:57:48 +01:00
cvium
4f45c52674 Remove ILibraryManager as a dependency in resolvers etc. 2021-11-15 15:56:02 +01:00
cvium
5a65bc1e69 Very light cleanup in applicationhost 2021-11-13 14:37:26 +01:00
Claus Vium
c3523e7cf7
Merge pull request #5905 from BaronGreenback/TVFix 
Fix for Livetv and DLNA when bind interfaces specified.
 2021-11-09 19:53:21 +01:00
cvium
82e6a21f3b Use the new method in DLNA 2021-11-08 10:58:04 +01:00
cvium
f03e77a4d5 Merge branch 'master' into TVFix 2021-11-08 10:38:08 +01:00
Cody Robibero
3398f7f953
Merge branch 'master' into client-logger 2021-11-03 07:52:06 -06:00
Bond_009
104e36f2f9 Streamline startup code 2021-11-02 16:02:52 +01:00
Cody Robibero
f78f1e834c Merge remote-tracking branch 'upstream/master' into client-logger 2021-10-26 17:43:36 -06:00
Claus Vium
5eda5eb636
Merge pull request #6486 from fredriklindberg/support-forwarded-headers-for-api-url 2021-10-25 22:41:32 +02:00
Bond_009
03f933aaa0 Fix the last few warnings 
Enables TreatWarningsAsErrors for all projects
 2021-10-06 11:30:45 +02:00
Fredrik Lindberg
90174f68e2 Dynamically populate LocalAddress based on HTTP request 
Support populating the LocalAddress field in the system info
endpoint based on the x-forwarded-host and x-forwarded-proto header.

The x-forwarded-host header must contain both the host and port for
the url to be properly constructed.

Behind network configuration option that is disabled by default.
 2021-09-14 21:38:11 +02:00
cvium
153e920239 Ignore published server url for local access 2021-09-07 11:48:06 +02:00
cvium
be9663ae89 Use GetSmartApiUrl instead (hopefully it works) 2021-09-07 10:27:55 +02:00
cvium
ffe5ae8056 Merge branch 'master' into TVFix 2021-09-05 10:11:17 +02:00
Bond_009
637e86478f Fix some warnings 2021-09-03 19:32:11 +02:00
Cody Robibero
ff9d14c811 Merge remote-tracking branch 'upstream/master' into authenticationdb-efcore 2021-09-03 11:01:55 -06:00
Cody Robibero
ec13412155 Merge remote-tracking branch 'upstream/master' into warn-259810 2021-09-03 06:56:45 -06:00
Bond_009
963ab2dab6 Simplify the way we choose our ffmpeg 
* no longer search $PATH
* no longer require a full path
* don't fall back
 2021-08-30 15:40:52 +02:00
Cody Robibero
cba07b1ca6 Remove more and more warnings 2021-08-28 16:32:50 -06:00
Patrick Barron
45f478f63e Merge branch 'master' into authenticationdb-efcore 
# Conflicts:
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Security/IAuthenticationRepository.cs
#	MediaBrowser.Controller/Session/ISessionManager.cs
 2021-08-13 21:08:24 -04:00
Claus Vium
5a9bd712b3
Merge pull request #6296 from Bond-009/oscheck 
Improve platform checks
 2021-07-23 20:54:13 +02:00
Bond-009
b20977dc25
Merge pull request #6289 from Bond-009/warn33 
Fix some warnings
 2021-07-12 23:53:52 +02:00
Bond_009
8528e9bddb Improve platform checks 2021-07-12 20:21:51 +02:00
Bond_009
915141f196 Fix some warnings 2021-07-11 22:51:36 +02:00
Bond_009
b91c4be74c Remove old "has update available" code 
This is the job of a package manager (or maybe the tray app for windows)
 2021-07-11 22:42:02 +02:00
Patrick Barron
be88efce3c Merge branch 'master' into authenticationdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Net/ISessionContext.cs
 2021-06-18 18:56:10 -04:00
Patrick Barron
a0c6f72762 Migrate authentication db to EF Core 2021-05-20 23:56:59 -04:00
Bond_009
7e8428e588 Enable nullable reference types for Emby.Server.Implementations 2021-05-20 22:48:53 +02:00
Patrick Barron
a225f34796 Merge branch 'master' into authenticationdb-efcore 
# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
 2021-05-18 18:09:46 -04:00
BaronGreenback
2e98de9062
Code Clean up: Convert to null-coalescing operator ?? (#5845) 
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
 2021-05-05 13:51:14 +02:00
BaronGreenback
417a7011c7 changed to first 2021-05-04 16:32:17 +01:00
BaronGreenback
7ff52bf755 Renamed 2021-05-03 19:30:56 +01:00
BaronGreenback
7936ea59eb Changed selection method 2021-05-03 17:27:23 +01:00
BaronGreenback
a5aabbb885
Update ApplicationHost.cs 
Renamed method
 2021-05-01 17:14:37 +01:00
BaronGreenback
2182640519
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2021-04-30 09:08:56 +01:00
BaronGreenback
78e97dbaa9 updated comment 2021-04-26 19:56:15 +01:00
BaronGreenback
5741fa7dfa Fix url for LiveTV 2021-04-26 17:13:45 +01:00