cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 10:29:01 -07:00
Code Issues Packages Projects Releases Wiki Activity
19,154 Commits 20 Branches 81 Tags 1.3 GiB
81ca6cb47c
Commit Graph

878 Commits

Author SHA1 Message Date
crobibero
1dafd70f51 Don't nest DeviceProfile 2020-11-23 10:50:18 -07:00
crobibero
fafddfc45e Add TODO notice 2020-11-23 09:51:24 -07:00
crobibero
f336d20b06 Fix sending PlaybackInfo 2020-11-23 09:49:42 -07:00
crobibero
3bff1ff8a2 Fix namespace and add attribute 2020-11-22 18:46:55 -07:00
Joshua M. Boniface
2c9e355e42
Merge branch 'master' into NetworkPR2 2020-11-21 23:28:15 -05:00
Joshua M. Boniface
b707d8e09d
Merge pull request #4486 from crobibero/split-api 
Remove api client generator errors
 2020-11-21 17:19:08 -05:00
Joshua M. Boniface
f6c842e7b3
Merge pull request #4513 from BaronGreenback/LatestPluginSelected 
Multi-repository plugins
 2020-11-21 17:18:19 -05:00
Joshua M. Boniface
509a4d0900
Merge pull request #4526 from crobibero/mark-played 
Fix marking item as played
 2020-11-21 17:17:44 -05:00
Claus Vium
fab03942f5
Merge pull request #4537 from crobibero/session-caps-full 
Convert ClientCapabilities to a Dto with JsonConverters
 2020-11-21 21:34:58 +01:00
Joshua M. Boniface
1e6539d0dc
Merge pull request #4539 from crobibero/nullable-enum-model-binder 
Add NullableEnumModelBinder and NullableEnumModelBinderProvider
 2020-11-21 15:14:59 -05:00
Greenback
5224200e8c Fixed baseurl in dlna. 2020-11-21 19:50:40 +00:00
crobibero
40531db1ae Add NullableEnumModelBinder and NullableEnumModelBinderProvider 2020-11-21 11:58:35 -07:00
crobibero
c8c5feacb6 Convert ClientCapabilities to a Dto with JsonConverters 2020-11-21 11:37:22 -07:00
Greenback
e41d1773ba changes 2020-11-21 16:14:03 +00:00
Greenback
c4753cec6c Fixed merge. 2020-11-21 14:05:09 +00:00
Greenback
616caca2b7 Added more comments. 2020-11-21 13:27:27 +00:00
Bond_009
f5973d57e8
Remove UTF8 bom from some files 2020-11-21 14:26:03 +01:00
Claus Vium
937e2a84e8
Merge pull request #4533 from Bond-009/nullref3 
Fix nullref
 2020-11-21 14:14:12 +01: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
Bond_009
c01042b355
Fix nullref 2020-11-21 12:28:32 +01:00
BaronGreenback
7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
crobibero
b3d322f79f Fix build after merge 2020-11-20 10:50:11 -07:00
crobibero
8f58f63b08 Merge remote-tracking branch 'upstream/master' into split-api 2020-11-20 10:35:46 -07:00
Joshua M. Boniface
7457c4a95d
Merge pull request #4499 from crobibero/more-param 
Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids
 2020-11-20 12:34:18 -05:00
Joshua M. Boniface
799eb44005
Merge pull request #4514 from Artiume/patch-9 
Update FFmpeg log
 2020-11-20 12:34:10 -05:00
Joshua M. Boniface
c901f1da41
Merge pull request #4518 from crobibero/livetv-hls 
Fix live tv hls playback
 2020-11-20 12:33:48 -05:00
crobibero
2f75f84b6f Fix marking item as played 2020-11-20 10:22:40 -07:00
Claus Vium
44ff7a4843
Apply suggestions from code review 2020-11-20 08:06:28 +01:00
nyanmisaka
b4598bd71b Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-20 10:01:17 +08:00
nyanmisaka
ca33ace3e9 rename 2020-11-20 09:57:28 +08:00
artiume
6a751251e7
Update Jellyfin.Api/Helpers/TranscodingJobHelper.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-19 19:45:26 -05:00
artiume
a46b70b169
Truncate GUID to 8 char 2020-11-19 19:23:04 -05:00
crobibero
d58e435409 Add response code documentation 2020-11-19 16:16:23 -07:00
crobibero
fe8531f74e Fix live tv hls playback 2020-11-19 16:15:20 -07:00
Fernando Fernández
e21e00cad5 Merge remote-tracking branch 'upstream/master' into no-scaling 2020-11-19 23:18:25 +01:00
artiume
3423bdf53a
Update Jellyfin.Api/Helpers/TranscodingJobHelper.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-19 15:51:58 -05:00
Greenback
a3e47f3e4e Updated to latest Unstable. 2020-11-19 18:27:18 +00:00
Fernando Fernández
2deda0437d Review suggestions 2020-11-19 16:36:19 +01:00
nyanmisaka
20d6999d8c minor changes 2020-11-19 23:04:44 +08:00
Nyanmisaka
5ff08338d5
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-11-19 15:02:36 +00:00
nyanmisaka
51dab0958d changes per suggestions 2020-11-19 22:46:02 +08:00
Greenback
1df58fbaa0 updated 2020-11-19 14:12:33 +00:00
artiume
e6e7295320
oops 2020-11-19 08:58:16 -05:00
artiume
4e07d9d561
Update FFmpeg log 2020-11-19 08:49:21 -05:00
Greenback
18855a7884 Initialial upload 2020-11-19 13:34:09 +00:00
BaronGreenback
4c394eec90
Update Jellyfin.Api/Controllers/LiveTvController.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-18 14:08:44 +00:00
Greenback
e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
Fernando Fernández
38c3b6fcd3 Fix build and thread detection logic 2020-11-18 10:20:59 +01:00
dkanada
742966573d
Merge pull request #4503 from jellyfin/cancellation 
Pass cancellation where possible
 2020-11-18 13:46:13 +09:00
crobibero
f6c6ee2008 Fix Environment authorization policy 2020-11-17 13:44:51 -07:00