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

374 Commits

Author SHA1 Message Date
herby2212
6c5a4a93cc fix indentation after merge 2023-10-21 11:49:01 +02:00
herby2212
27ceee8b6c update to current master to resolve merge conflict 2023-10-21 01:20:59 +02:00
Nick
cd662506a1 Merge branch 'master' into trickplay 2023-10-18 19:27:05 -07:00
herby2212
db5c2f738e integrate development from v1 2023-10-07 21:18:21 +02:00
Cody Robibero
ba7e3bfd82 Migrate to customizable cast receiver config 2023-09-23 11:04:53 -06:00
Nick
fc61933748 Minor code changes 2023-06-26 22:04:39 -07:00
nicknsy
6744e712d3 Use config values 2023-06-22 16:23:51 -07:00
Bond-009
3982b0e057
Reduce bottlenecks scan code (#9863) 2023-06-21 21:01:47 -06:00
Frank Riley
1952a915e6 Move hardcoded LibraryUpdateDuration to ServerConfiguration. Fixes #9893. 
Signed-off-by: Frank Riley <fhriley@gmail.com>
 2023-06-19 07:31:22 -07:00
herby2212
ace89e4597 fix formatting and update summary 2023-05-14 15:05:03 +02:00
herby2212
e1190d15d6 option to disable and configure inactive session threshold 2023-05-01 20:11:22 +02:00
Stepan Goremykin
26958162d0 Remove unused using directives 2023-04-06 19:17:28 +02:00
Shadowghost
21dcf775be
Add config option to disable dummy chapter generation (#9410) 2023-03-14 16:20:12 -06:00
Hannes Braun
66eff8b9ca
Allow limiting parallel image encodings to reduce memory usage (#8783) 2023-01-16 10:06:44 -07:00
Bond-009
69a51c425a
Fix all warnings in Jellyfin.Api (#9003) 2023-01-04 08:01:31 -07:00
Negulici-R. Barnabas
7db1813cc8 changed ChapterImageResolution in model to enum type; 
added 144p to the ImageResolution enum;
updated chapters limit comment inside FFProbeVideoInfo.cs;
 2022-11-13 16:23:21 +02:00
Negulici-R. Barnabas
12ec0e285d Chapter Images: 
- chapter image extraction intervals, limit count and resolutions can be set by the user from the server general settings;
 2022-07-18 17:50:52 +03:00
Cody Robibero
1ed57f48a5 Merge pull request #7624 from nielsvanvelzen/quickconnect-enable-d 
(cherry picked from commit 1d5961126e6b8415ebd494a56acddd68624cd75b)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-04-28 09:26:45 -04:00
cvium
69df004b9f Migrate network configuration safely 2021-11-24 13:00:12 +01:00
cvium
96ea865681 Refactor omdb providers 2021-11-19 15:32:07 +01:00
Cody Robibero
73201ed498 Default log upload to enabled 2021-10-29 06:33:46 -06:00
Cody Robibero
c534c45033 Suggestions from review 2021-10-27 19:20:14 -06:00
dkanada
75ec8b0c8c
Merge pull request #5207 from matthin/default-language 
Default to English metadata during the setup wizard.
 2021-02-14 16:06:27 +09:00
dkanada
9fcdbd4c4b remove deprecated settings from server config 2021-02-12 21:58:37 +09:00
me@justinharrison.ca
90236efdf2
Default to English metadata during the setup wizard. 2021-02-10 17:08:55 -05:00
Cody Robibero
5c57569692
Merge branch 'master' into PluginDowngrade 2020-12-30 18:11:37 -07:00
artiume
cd979e6b62
Add default of 5 minutes 2020-12-30 08:52:11 -05:00
MrTimscampi
48d8536d2f Enable TMDB and OMDB by default 2020-12-28 09:19:08 +01:00
Greenback
7986465cf7 Initial upload 2020-12-14 16:14:39 +00:00
Claus Vium
f1cc01f324
Merge pull request #4242 from Spacetech/library_scan_speed 
Increase library scan and metadata refresh speed
 2020-12-04 13:17:26 +01:00
BaronGreenback
e8cb9cea7d
Merge branch 'master' into library_scan_speed 2020-11-21 22:54:40 +00:00
Greenback
086e2fdaa1 Fixed a couple of merge errors. 2020-11-21 14:09:56 +00:00
Greenback
c4753cec6c Fixed merge. 2020-11-21 14:05:09 +00:00
BaronGreenback
124bd4c2c0
Networking: 1 - Network Manager (#4124) 
* NetworkManager

* Config file with additional options.

* Update Jellyfin.Networking/Manager/INetworkManager.cs

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

* Update Jellyfin.Networking/Manager/INetworkManager.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Split function.

* Update Jellyfin.Networking/Manager/INetworkManager.cs

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

* fixed iterations

* Update Jellyfin.Networking.csproj

* Update NetworkManager.cs

* Updated to NetCollection 1.03.

* Update ServerConfiguration.cs

* Update StartupController.cs

* Update INetworkManager.cs

Removed public

* Update INetworkManager.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Updated comment

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/INetworkManager.cs

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

* Remove mono code.
Removed forced chromecast option

* Inverted if

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Moved config into a separate container

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Changed sortedList to dictionary.

* Update INetworkManager.cs

Changed UpdateSettings param type

* Update NetworkManager.cs

* Update NetworkManager.cs

* Update NetworkManager.cs

* Update NetworkConfiguration.cs

* Update INetworkManager.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

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

* Updated changes github didn't update.

* Fixed compilation.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Removed read locking.

* Update NetworkManager.cs

Changed configuration event to NamedConfigurationUpdated

* updated comment

* removed whitespace

* Updated NetCollection to 1.0.6
Updated DXCopAnalyser to 3.3.1

* removed NetCollection

* Update NetworkManager.cs

* Update NetworkExtensions.cs

* Update NetworkExtensions.cs

Removed function.

* Update NetworkExtensions.cs

* Update NetworkManager.cs

Changed ToString() to AsString() as native collection formats incorrectly.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update NetworkExtensions.cs

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update MediaBrowser.Common/Net/IPObject.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* updated

* Replaced NetCollection with Collection<IPObject>

* Update MediaBrowser.Common/Net/NetworkExtensions.cs

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

* Update MediaBrowser.Model/Configuration/PathSubstitution.cs

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

* Update MediaBrowser.Common/Net/NetworkExtensions.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update MediaBrowser.Common/Net/IPHost.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* Update MediaBrowser.Common/Net/IPObject.cs

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

* updated comments.

* Updated comments / changes as suggested by @crobibero.

* Split function as suggested

* Fixed null ref.

* Updated comment.

* Updated cs to .net5

* Fixed issue with PublishedServerUrl

* Fixes

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Restored locking

* optimisation

* Added comment

* updates.

* updated.

* updates

* updated.

* Update IPHost.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Update NetworkManager.cs

* Removed whitespace.

* Added debug logging

* Added debug.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

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

* Replaced GetAddressBytes

Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2020-11-21 13:59:14 +01:00
Gary Wilber
f680a0fbbe fix merge 2020-11-08 11:55:38 -08:00
Gary Wilber
e6d8c02944 Merge remote-tracking branch 'upstream/master' into library_scan_speed 2020-11-08 11:51:40 -08:00
BaronGreenback
ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
crobibero
ceecc80bb3 Allow configuration of ActivityLogRetention 2020-11-01 18:32:41 -07:00
Greenback
39754b840d minor fixes 2020-10-08 19:16:47 +01:00
Gary Wilber
c2276b17cb Increase library scan and metadata refresh speed 2020-09-30 19:33:34 -07:00
Jim Cartlidge
3b64171cde Minor change to get it to compile. 2020-09-30 18:02:36 +01:00
Jim Cartlidge
bbe2400b59 Updating to NetCollection 1.03 2020-09-30 17:51:17 +01:00
spookbits
5cca8bffea Removed browser auto-load functionality from the server. 
Added profiles in launchSettings to start either the web client or the swagger API page.
Removed --noautorunwebapp as this is the default functionality.
 2020-09-16 13:22:04 -04:00
Jim Cartlidge
9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
cvium
78cab77f81 Add Known Proxies to system configuration 2020-09-10 11:05:46 +02:00
crobibero
8a08111adc Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-05 09:00:55 -06:00
crobibero
1feee6f95e Properly host static files and set base url 2020-09-02 08:03:15 -06:00
crobibero
65d05f92ac Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-01 18:27:55 -06:00
crobibero
3c0484cc97 Allow for dynamic cors response 2020-08-30 09:32:14 -06:00
Matt Montgomery
4fa3d3f4f3 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-12 15:38:07 -05:00