Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity
19,382 Commits 15 Branches 89 Tags
Commit Graph

755 Commits

Author SHA1 Message Date
Bond-009
00a608dfab Merge pull request #4781 from crobibero/map-xmltv 
Use request body for mapping xml channels

(cherry picked from commit 906ee4f96229a0cc4c481911d6443c68af6d4a2d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-30 18:55:50 -05:00
Claus Vium
480ded0671 Merge pull request #4771 from crobibero/typed-get-preference 
Use typed UserManager GetPreference

(cherry picked from commit 21d2e9ff0cc0933484b2a7768d7a36446b36616a)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-30 18:55:50 -05:00
Claus Vium
24b2991def Merge pull request #4761 from crobibero/playlist 
(cherry picked from commit 13bb5e1ead9ee22efe28f120d9dced9b528dbf10)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:33 -05:00
Claus Vium
87dde66e92 Merge pull request #4758 from nyanmisaka/fix-landingScreen-options 
(cherry picked from commit f8ef38c0eafdfffe5314ae5514d5f8ee813fa3b7)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:33 -05:00
Claus Vium
259d811b95 Merge pull request #4722 from crobibero/forbid 
Fix API forbidden response

(cherry picked from commit 80ff564143b0745cba4b01b5378df6415f4072af)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Joshua M. Boniface
7e01cce884 Merge pull request #4716 from OancaAndrei/syncplay-new-auth-policies 
(cherry picked from commit 4f6a585424ac8fc66d1f2d5a7fc71a9e85cd23de)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Claus Vium
723fe43d2e Merge pull request #4711 from barronpm/api-fixes 
Add required attributes to parameters

(cherry picked from commit 4c199ac9a510647d374e4bfc11c6879f3daefc29)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Bond-009
683bc27b27 Merge pull request #4672 from cvium/fix_mergeversions_which_was_unrelated_to_my_bughunt 
Fix MergeVersions endpoint

(cherry picked from commit 26919eed260f0230699200d3a654d184132a4ae0)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:31 -05:00
Joshua M. Boniface
bba01bf7b9
Merge pull request #3194 from OancaAndrei/syncplay-enhanced 
SyncPlay for TV series (and Music)
 2020-12-04 20:22:30 -05:00
crobibero
76250a8895 Use md5 Guid for legacy compat 2020-12-04 16:27:31 -07:00
crobibero
3db6ae91f6 Add ItemId to all display preferences 2020-12-04 16:00:11 -07:00
Ionut Andrei Oanca
23473ef8fb Fix access policies to SyncPlay 2020-12-04 22:03:35 +01:00
crobibero
8d8738835e Use DisplayPreferencesId as ItemId 2020-12-04 09:16:38 -07:00
crobibero
e765184afa Fix existing DisplayPreferences migration 2020-12-03 15:00:26 -07:00
crobibero
685c966468 Suggestion from review 2020-12-03 14:35:18 -07:00
crobibero
b0c79edd2c Add support for custom item display preferences 2020-12-03 13:51:12 -07:00
Ionut Andrei Oanca
7169c0a22d Move SyncPlay request DTOs to proper namespace 2020-12-03 19:01:57 +01:00
Ionut Andrei Oanca
389367fec8 Rename 'track' into 'item' in SyncPlay 2020-12-03 15:54:39 +01:00
cvium
7e0ea296c3 Move request validation to auth policies 2020-12-03 10:43:44 +01:00
Claus Vium
1d3b2e8dd6
Merge pull request #4643 from crobibero/empty-lib-null-ref 
Fix null reference when getting filters of an empty library
 2020-12-03 07:58:05 +01:00
crobibero
828504e925 The future is now 2020-12-02 08:04:08 -07:00
crobibero
08be7f094a Cleaner type checking 2020-12-02 07:55:34 -07:00
crobibero
41e127d1d2 Fix null reference when getting filters of an empty library 2020-12-02 07:42:25 -07:00
crobibero
09b1e571f4 Apply suggestions from review 2020-12-02 07:11:42 -07:00
crobibero
b5a7a74e89 Use GetParentItem where applicable 2020-12-01 16:16:17 -07:00
crobibero
f48e47be5f Split nested conditional 2020-12-01 12:10:11 -07:00
crobibero
c083b29e29 Use Guid as API parameter type where possible 2020-12-01 11:07:41 -07:00
nyanmisaka
ea592d0256 fix trascodeReasons report 2020-11-30 18:41:59 +08:00
Ionut Andrei Oanca
78ea8ef99e Create common interface for SyncPlay requests 2020-11-28 16:03:02 +01:00
Ionut Andrei Oanca
c60714e365 Move query parameters to request body in SyncPlay 2020-11-28 14:20:46 +01:00
Joshua M. Boniface
c98c2ab955
Merge branch 'master' into syncplay-enhanced 2020-11-27 09:46:18 -05:00
Joshua M. Boniface
9169a28df1
Merge pull request #4588 from jellyfin/hex 
Remove Hex class as the BCL has one now
 2020-11-27 01:59:58 -05:00
Bond_009
38932fc7d1 Schedules Direct requires the hex to be lowercase 2020-11-26 13:21:04 +01:00
Bond_009
8c8a71692e Remove Hex class as the BCL has one now 2020-11-25 23:40:31 +01:00
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
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
Greenback
5224200e8c Fixed baseurl in dlna. 2020-11-21 19:50:40 +00:00
crobibero
c8c5feacb6 Convert ClientCapabilities to a Dto with JsonConverters 2020-11-21 11:37:22 -07:00
Greenback
c4753cec6c Fixed merge. 2020-11-21 14:05:09 +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