michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,229 Commits 2 Branches 79 Tags 73 MiB
e88367fe70
Commit Graph

935 Commits

Author SHA1 Message Date
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
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
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
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
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
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
crobibero
f6c6ee2008 Fix Environment authorization policy 2020-11-17 13:44:51 -07:00
crobibero
7bf647bb94 Remove precondition checks 2020-11-17 09:38:50 -07:00
crobibero
3b68ce1183 Fix build 2020-11-16 20:45:09 -07:00
crobibero
2a0578ce1a Add missing manual splits 2020-11-16 20:37:43 -07:00
crobibero
3cc0dd7e12 Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids usage. 2020-11-16 20:29:46 -07:00
Greenback
60a6627140 Removing left over edits left from the acceptance of previous PR's. 2020-11-16 19:45:21 +00:00
BaronGreenback
d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
nyanmisaka
488dbdb31d Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-16 12:36:55 +08:00
crobibero
dae4541bad Merge remote-tracking branch 'upstream/master' into dotnet-5 2020-11-15 11:56:35 -07:00
crobibero
547ee88561 Remove api client generator errors 2020-11-15 10:58:39 -07:00
nyanmisaka
f953dd42be remove unused segment option 2020-11-16 01:09:14 +08:00
Ionut Andrei Oanca
c7e53bce2f Patch data-races and minor changes in SyncPlay 2020-11-15 17:30:28 +01:00
Ionut Andrei Oanca
5d77f422f0 Hide some property setters, init null values, update namespaces 2020-11-14 23:40:01 +01:00
Bond_009
ff49a3bb61
Missed some stuff 2020-11-14 20:28:15 +01:00
Bond_009
c4bb32f259
Access last element by index where possible 2020-11-14 20:28:14 +01:00
nyanmisaka
e36725096a fix return type for GetAttachment 2020-11-14 22:28:22 +08:00
Ionut Andrei Oanca
1dbc91978e Address requested changes and fix some warnings 2020-11-14 12:33:54 +01:00
nyanmisaka
750eaa9d27 fix ci 2020-11-14 18:30:20 +08:00
Nyanmisaka
06670351ae
Apply suggestions from code review 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
 2020-11-14 10:19:41 +00:00
nyanmisaka
fc89b7e641 minor changes 2020-11-14 16:02:16 +08:00
nyanmisaka
32bb73acbb add aac_adtstoasc bitstream filter for mpegts to mp4 conversion 2020-11-14 14:23:00 +08:00
crobibero
73d2cb1c2a Updated based on review feedback 2020-11-13 18:04:06 -07:00
nyanmisaka
f1e129f17a minor changes 2020-11-14 03:57:37 +08:00
nyanmisaka
8c0778e827 switch ffmpeg to hls muxer for live streaming 
segment muxer cannot make fMP4 init file.
'-strict -2' option doesn't work with segment muxer for flac remuxing.
 2020-11-14 03:47:54 +08:00
crobibero
95ebb9a55a Use null coalescing when possible 2020-11-13 11:24:46 -07:00
crobibero
5f52a58e78 Convert NullReferenceException to ResourceNotFoundException 2020-11-13 11:14:44 -07:00
crobibero
01355e0498 Fix nullability errors in Jellyfin.Api (part 1) 2020-11-13 09:04:31 -07:00
dkanada
660aa1b8a6
Merge pull request #4469 from cvium/fix_repository_endpoint 
Change OPTIONS to POST and call SaveConfiguration in SetRepositories
 2020-11-12 22:37:19 +09:00
cvium
8e0909ef6f Change OPTIONS to POST and call SaveConfiguration 2020-11-12 10:13:56 +01:00
cvium
0ac3af13ac Semi-revert removal of Name for /Similar in openapi 2020-11-12 09:21:46 +01:00
nyanmisaka
11c74cb65c fix for no audio stream video 2020-11-11 19:04:58 +08:00
Claus Vium
0b954df7c2
Update Jellyfin.Api/Controllers/LibraryController.cs 2020-11-11 10:49:00 +01:00
Claus Vium
a7b3880d0e
Merge branch 'master' into fix_and_mildly_improve_similar 2020-11-11 10:47:18 +01:00
Nyanmisaka
0b01acbe91
Apply suggestions from code review 
Co-authored-by: BaronGreenback <jimcartlidge@yahoo.co.uk>
 2020-11-11 02:03:53 +00:00
crobibero
f5b301dea6 Correct bad docs merge 2020-11-10 11:48:21 -07:00
crobibero
7fe8ca2b77 Merge remote-tracking branch 'upstream/master' into query-fields 2020-11-10 10:39:44 -07:00
crobibero
0dd2b169a3 Add ModelBinder to ItemFilter 2020-11-09 14:59:04 -07:00
crobibero
6748ba287d Merge remote-tracking branch 'upstream/master' into query-fields 2020-11-09 14:57:02 -07:00
crobibero
b22831f7e5 Add ModelBinder to ImageType 2020-11-09 14:53:23 -07:00
cvium
b99519898d Remove duplicate /Similar endpoints and add poor matching for artists and albums 2020-11-09 20:15:15 +01:00
nyanmisaka
2229ca38ac pascal case 2020-11-08 19:33:40 +08:00
nyanmisaka
737cb727f9 Merge remote-tracking branch 'upstream/master' into fonts 2020-11-08 19:11:54 +08:00
Claus Vium
96dcd9c87e
Merge pull request #3086 from redSpoutnik/api-upload-subtitle 
Add Post subtitle in API
 2020-11-08 11:32:53 +01:00
Claus Vium
ec2538a1ba
Merge pull request #4420 from cvium/fix_person_studio_genre_endpoints 
Fix Persons, Genres and Studios endpoints
 2020-11-08 10:22:18 +01:00
Claus Vium
1823cbb026
Merge pull request #4412 from cvium/fix_displaypreferences_creation 
Save new display preferences
 2020-11-08 10:22:05 +01:00
nyanmisaka
5048719a64 minor changes per suggestions 2020-11-08 09:01:58 +00:00
nyanmisaka
1abd3d1bd8 fix the fmp4 header file generate on linux 2020-11-08 07:13:00 +00:00
crobibero
a7f2073c68 Add missing dlna attributes. 2020-11-07 17:30:56 -07:00
nyanmisaka
85965741f5 add initial support for HEVC over FMP4-HLS 2020-11-08 01:39:32 +08:00
Claus Vium
8c5e0ddae0
Merge pull request #4401 from nyanmisaka/respect-music-settings 
Respect music quality settings when transcoding
 2020-11-07 10:57:57 +01:00
Claus Vium
6afd990986
Merge pull request #4424 from jellyfin/minor8 
Minor perf improvements
 2020-11-06 17:11:01 +01:00
Bond_009
134fd0d960 > -> < 2020-11-06 16:39:41 +01:00
Bond-009
3e819eeb02
Merge pull request #4411 from crobibero/fix-auth 
Fix endpoint authorization requirements
 2020-11-06 16:27:51 +01:00
Bond_009
b21919c7f4 Minor perf improvements 2020-11-06 16:15:30 +01:00
crobibero
41b38c6735 Merge remote-tracking branch 'upstream/master' into livetv-ts-fix 2020-11-06 07:15:38 -07:00
cvium
b693c52fe7 Make /MusicGenres obsolete 2020-11-06 09:42:59 +01:00
cvium
de52c8a497 Revert "Make /MusicGenres obsolete" 2020-11-06 09:35:23 +01:00
cvium
6e6ecbc988 Make /MusicGenres obsolete 2020-11-06 08:34:20 +01:00
crobibero
3756611d01 Add /Users/Me endpoint 2020-11-05 13:23:22 -07:00
cvium
6fdcd12053 Fix build and clean up MusicGenres 2020-11-05 12:53:23 +01:00
cvium
584b4fa41f Fix Persons, Genres and Studios endpoints 2020-11-05 12:27:22 +01:00
BaronGreenback
ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
crobibero
b4d52d8009 Apply patch 2020-11-03 16:38:47 -07:00
crobibero
5d88e61076 Merge remote-tracking branch 'upstream/master' into livetv-ts-fix 2020-11-03 07:05:58 -07:00
Bond-009
8fc16043c7
Merge pull request #4405 from nyanmisaka/aac-directstream 
Fix AAC direct streaming
 2020-11-03 10:59:43 +01:00
Bond-009
13c70c415a
Merge pull request #4409 from crobibero/fix-separators 
Fix API separators
 2020-11-03 10:58:03 +01:00
crobibero
f8e6edbfeb Merge remote-tracking branch 'upstream/master' into query-fields 2020-11-02 10:29:18 -07:00
Anthony Lavado
6205fb4b6a
Merge pull request #4341 from Bond-009/minor6 
Minor improvements
 2020-11-02 11:10:39 -05:00
Bond-009
95918d161e
Merge pull request #4328 from crobibero/trigger-warning 
Remove CommaDelimitedArrayModelBinderProvider
 2020-11-02 16:52:05 +01:00
cvium
af56d5c2dc Rename itemIds to ids 2020-11-02 11:53:23 +01:00
cvium
19d77c99ae Save new display preferences 2020-11-02 09:23:29 +01:00
crobibero
6a07e93ddd Fix endpoint auth 2020-11-01 20:37:03 -07:00
crobibero
dd3507bbbf Fix OfficialRatings separator 2020-11-01 18:54:00 -07:00
crobibero
c1ec46e92b Fix Tags separator 2020-11-01 18:53:27 -07:00
crobibero
826c24142e Fix Genres separator 2020-11-01 18:53:02 -07:00
nyanmisaka
599e20ab9b fix music directplay on Gelli 2020-11-01 18:45:42 +08:00
nyanmisaka
e5237384d5 fix the route of audio containers 2020-11-01 04:20:25 +08:00
nyanmisaka
00f0c14d7b respect music quality settings when transcoding 2020-10-31 16:09:22 +08:00
Greenback
6dc2936d9c Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-30 13:54:46 +00:00
Patrick Barron
72263613d0 Convert some code in UserManager to async 2020-10-29 20:30:33 -04:00
crobibero
3568c5f39b Fix early filestream close 2020-10-29 13:56:29 -06:00
crobibero
11d69fd3b1 Make MrLinter happy 2020-10-29 11:36:45 -06:00
crobibero
372f0eb38a Remove AddItemFields 2020-10-29 11:17:13 -06:00
crobibero
b9406e5444 Merge remote-tracking branch 'upstream/master' into query-fields 2020-10-29 11:11:50 -06:00
Cody Robibero
96071ef30d
Move slash to correct location for quoting 2020-10-28 20:26:33 -06:00
crobibero
c0383ba07d Add missing slashes in ffmpeg argument. 2020-10-28 20:23:39 -06:00
crobibero
36bae6f030 Use JsonConverter 2020-10-27 13:38:21 -06:00
crobibero
4f7c13ecf4 Merge remote-tracking branch 'upstream/master' into query-fields 2020-10-27 13:35:46 -06:00
crobibero
fd9d325fa8 Use JsonConverter 2020-10-27 13:32:59 -06:00
crobibero
4558c192c7 Merge remote-tracking branch 'upstream/master' into query-image-type 2020-10-27 13:25:57 -06:00
BaronGreenback
0b5ddc90ff
Merge branch 'master' into NetworkPR2 2020-10-26 13:21:48 +00:00
cvium
c11f19f090 Fix GET ScheduledTasks return value 2020-10-26 11:21:32 +01:00
Bond_009
49569ca0a0 Use nameof where possible 2020-10-17 16:19:57 +02:00
Ionut Andrei Oanca
8819a9d478 Add playlist-sync and group-wait to SyncPlay 2020-10-16 12:06:29 +02:00
crobibero
f2a86d9c80 Remove CommaDelimitedArrayModelBinderProvider 2020-10-14 13:03:36 -06:00
dkanada
4fafa5796d
Merge pull request #4304 from crobibero/query-location-type 
Convert exclude location type string to enum.
 2020-10-11 18:32:22 +09:00
dkanada
6e585ccfb2
Merge pull request #4303 from crobibero/query-filters 
Convert filters string to enum.
 2020-10-11 18:31:38 +09:00
Greenback
6dc81ec8e8 Changes to support network config 2020-10-10 14:05:19 +01:00
Anthony Lavado
ecabcff8f0
Merge pull request #4274 from barronpm/activitylog-query 
Rewrite Activity Log Backend
 2020-10-09 20:12:26 -04:00
Anthony Lavado
ea5c78ee21
Merge pull request #4259 from ConfusedPolarBear/imageFormat 
Accept ImageFormat as API parameter
 2020-10-09 20:12:11 -04:00
crobibero
27e753ddb4 Convert image type string to enum. 2020-10-09 17:52:39 -06:00
crobibero
ed4b470397 Convert exclude location type string to enum. 2020-10-09 17:46:39 -06:00
crobibero
549f2284ad Convert filters string to enum. 2020-10-09 17:41:17 -06:00
crobibero
69360b749a Convert field string to enum. 2020-10-09 17:35:08 -06:00
Greenback
ebe650afa9 Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-09 14:12:41 +01:00
Greenback
deb4d27857 Moved all settings across to network.xml 2020-10-08 19:00:55 +01:00
Patrick Barron
4d7e7d6331 Rewrite activity log backend to use a query class. 2020-10-04 20:29:28 -04:00
BaronGreenback
5360f5a43d
Update UserController.cs 2020-10-04 10:03:08 +01:00
Matt Montgomery
7cec65b973 Update documentation 2020-10-03 14:35:57 -05:00
Matt Montgomery
754e859f6e Convert strings to ImageFormat 2020-10-02 12:05:39 -05:00
github@esslinger.dev
c3e7eb3a6f Merge branch '4214-supported-commands-enum' of https://github.com/skyfrk/jellyfin into 4214-supported-commands-enum 2020-10-02 18:29:59 +02:00
github@esslinger.dev
9aad772288 feat: implement CommaDelimitedArrayModelBinderProvider 2020-10-02 18:26:48 +02:00
Simon Eßlinger
d10090b394
fix: remove unused null check 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-10-01 22:48:42 +02:00
github@esslinger.dev
ba12ea7f4a feat: use CommaDelimitedArrayModelBinder to retain API 2020-10-01 19:57:31 +02:00
github@esslinger.dev
dd4f3a7c51 feat: convert supportedCommands strings to enums 2020-10-01 18:43:44 +02:00
Jim Cartlidge
3b64171cde Minor change to get it to compile. 2020-09-30 18:02:36 +01:00
Jim Cartlidge
fcd1b2f0e4 Merged with latest master 2020-09-30 17:52:33 +01:00
crobibero
b7022e8dc1 Merge remote-tracking branch 'upstream/master' into package-install-repo 2020-09-26 16:57:53 -06:00
Bond-009
b41da8e5d7
Merge pull request #4209 from cvium/fix_forgotpassword 
Add Dto to ForgotPassword
 2020-09-25 20:06:53 +02:00
cvium
fed58a0327 Add Dto to ForgotPassword 2020-09-25 12:56:47 +02:00
cvium
c92eda53c5 Fix Identify by renaming route parameter to match function argument 2020-09-25 08:49:44 +02:00
BaronGreenback
d617c0b8b0
Update SystemController.cs 2020-09-24 15:47:35 +01:00
Jim Cartlidge
5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
Anthony Lavado
5aa743a6a2
Merge pull request #4163 from Bond-009/minor4 
Minor improvements
 2020-09-23 10:30:13 -04:00
Anthony Lavado
af24c43118
Merge pull request #4192 from nielsvanvelzen/generalcommand-sucks 
Use GeneralCommandType enum in GeneralCommand
 2020-09-23 09:57:45 -04:00
dkanada
1657af482a
Merge pull request #4082 from cromefire/patch-4 
More expressive names for the VideoStream API
 2020-09-23 19:58:06 +09:00
Niels van Velzen
891c538f81 Use GeneralCommandType in SessionController parameters 2020-09-21 17:49:45 +02:00
Niels van Velzen
3459655bb4 Use GeneralCommandType enum in GeneralCommand name 2020-09-21 16:56:22 +02:00
BaronGreenback
f71812abc0
Update SessionController.cs 2020-09-20 14:36:46 +01:00
BaronGreenback
d6f01d6503
Update DynamicHlsController.cs 2020-09-20 14:35:46 +01:00
BaronGreenback
9cb37ae9c2
Update Jellyfin.Api/Controllers/SessionController.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-09-20 12:44:10 +01:00
BaronGreenback
701d54260d
Update SessionController.cs 2020-09-19 15:46:47 +01:00
BaronGreenback
7050525f6b
Update SessionController.cs 2020-09-19 15:01:34 +01:00
BaronGreenback
50060175b1
Update DynamicHlsController.cs 2020-09-19 14:53:08 +01:00
BaronGreenback
d8e8d298ea
Update Jellyfin.Api/Controllers/SessionController.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-09-19 13:58:56 +01:00
BaronGreenback
eee977a77b
Update Jellyfin.Api/Controllers/SessionController.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-09-19 13:58:39 +01:00
BaronGreenback
4dae7d0521
Update Jellyfin.Api/Controllers/SessionController.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-09-19 13:58:18 +01:00
BaronGreenback
ea7b3699c2
Update SessionController.cs 
removed space
 2020-09-17 18:47:36 +01:00
BaronGreenback
d428ca55cd
Update DynamicHlsController.cs 2020-09-17 18:41:12 +01:00
BaronGreenback
8738fe570a
Update SessionController.cs 2020-09-17 18:27:07 +01:00
BaronGreenback
604edea6a6
Update DynamicHlsController.cs 
Removed container fields
 2020-09-17 18:26:27 +01:00
BaronGreenback
81db323f88
Update SessionController.cs 2020-09-17 17:54:09 +01:00
Bond_009
0007756a5e Fix 2020-09-16 15:35:37 +02:00
Bond_009
2dbf73b989 Minor improvements 2020-09-16 14:16:44 +02:00
Jim Cartlidge
38b8110a3e Removing blank lines. 2020-09-14 15:55:25 +01:00
Jim Cartlidge
b44455ad0d Update based on PR1 changes. 2020-09-14 15:46:38 +01:00
Jim Cartlidge
9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
crobibero
e3fb7f426c Migrate subtitle upload to Jellyfin.Api 2020-09-11 16:08:49 -06:00
Bond-009
1d633aac0a
Merge pull request #4093 from crobibero/bad-route 
Fix api routes
 2020-09-11 09:10:16 +00:00
Bond-009
4447589460
Merge pull request #4116 from cvium/add_known_proxies 
Add Known Proxies to system configuration
 2020-09-10 14:10:26 +00:00
cvium
7576824cee Standardize use of IsLocal and RemoteIp 2020-09-10 14:16:41 +02:00
crobibero
63ebae2f9e Remove nullable from required 2020-09-09 14:28:30 -06:00
crobibero
efce4d4bf3 Merge remote-tracking branch 'upstream/master' into bad-route 2020-09-09 14:23:53 -06:00
crobibero
25ac778a79 revert changes 2020-09-09 12:26:18 -06:00
crobibero
612e135c8c Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-09 12:02:05 -06:00
crobibero
8e15142d82 Merge remote-tracking branch 'upstream/master' into bad-route 2020-09-09 11:44:53 -06:00
crobibero
b2c2746a27 Fix container routes 2020-09-08 07:47:49 -06:00
Bond-009
5c7cdfe428
Merge pull request #4092 from crobibero/api-go-brrr 
Add missing FromRoute, Required attribute
 2020-09-08 11:48:24 +00:00
crobibero
14de45602b fix play command route 2020-09-07 18:59:55 -06:00
crobibero
af2186ab83 add back optional for route param 2020-09-07 18:50:09 -06:00
crobibero
6d3e15dc31 fix attribute spacing 2020-09-07 18:46:14 -06:00
crobibero
7294dc103f Fix api routes 2020-09-07 18:45:06 -06:00
Anthony Lavado
cc6b03296a
Merge pull request #3899 from crobibero/plugin-install 
Install specific plugin version if requested
 2020-09-07 19:39:55 -04:00
crobibero
afc8a307c7 Add missing FromRoute, Required attribute 2020-09-07 17:17:26 -06:00
Cromefire_
95265288a6
More expressive name for the VideoStream API 2020-09-07 21:46:19 +02:00
crobibero
eab92a0b01 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-06 14:34:31 -06:00
crobibero
29fc882037 merge all attributes 2020-09-06 09:07:27 -06:00
crobibero
b64108923a Add missing references 2020-09-05 17:11:44 -06:00
crobibero
59d47ec3f5 Make all FromRoute required 2020-09-05 17:07:25 -06:00
crobibero
d5eb246557 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-04 16:42:40 -06:00
Anthony Lavado
6152d40303
Merge pull request #4030 from crobibero/http-client-migrate 
Remove IHttpClient
 2020-09-04 18:38:39 -04:00
crobibero
2a8653b309 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-04 08:16:49 -06:00
crobibero
9f97c47936 Merge remote-tracking branch 'upstream/master' into api-doc-base-url 2020-09-04 07:57:59 -06:00
Claus Vium
81c764e87f
Merge branch 'master' into output-formatters 2020-09-04 11:44:15 +02:00
crobibero
21a5692626 Merge remote-tracking branch 'upstream/master' into api-doc-base-url 2020-09-03 16:18:36 -06:00
crobibero
4fc611bf29 fix merge 2020-09-03 13:50:02 -06:00
crobibero
a26063f775 fix merge 2020-09-03 13:48:48 -06:00
crobibero
eb2dcbddc0 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-03 13:47:00 -06:00
Patrick Barron
d814302707 Merge branch 'master' into scoped-displaypreferences 2020-09-03 15:15:43 -04:00
Bond-009
7582e17377
Merge pull request #3907 from crobibero/dlna 
Fix DLNA Routes
 2020-09-03 20:38:09 +02:00
Bond-009
42f22a8e55
Merge pull request #3976 from nyanmisaka/muxer 
Expose max_muxing_queue_size to user
 2020-09-03 20:36:17 +02:00
crobibero
a523ff840c Merge remote-tracking branch 'upstream/master' into output-formatters 2020-09-03 12:14:11 -06:00
crobibero
82f30a35db Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 10:40:08 -06:00
crobibero
b035a642d2 Merge remote-tracking branch 'upstream/master' into plugin-install 2020-09-03 10:37:35 -06:00
crobibero
1be84e8873 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-03 10:37:05 -06:00
crobibero
fb422ff741 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 07:46:52 -06:00
Claus Vium
2f9b482555
Merge branch 'master' into master 2020-09-03 14:54:00 +02:00
crobibero
9c6d0117b5 Add missing image return types 2020-09-03 06:42:56 -06:00
crobibero
932c4d25a4 Clean api return types 2020-09-02 15:06:13 -06:00
crobibero
a698dab66f Specify image file return for GetItemImage2 2020-09-02 11:14:59 -06:00
crobibero
1feee6f95e Properly host static files and set base url 2020-09-02 08:03:15 -06:00
crobibero
ec2a5e4fb0 Simplify file returns 2020-09-01 19:27:57 -06:00
crobibero
f443c534bf Merge remote-tracking branch 'upstream/master' into package-install-repo 2020-09-01 18:24:42 -06:00
crobibero
c473645f9d Set openapi schema type to file where possible 2020-09-01 17:31:31 -06:00
crobibero
c98952937e Fix ValidatePath response code 2020-09-01 17:29:08 -06:00
crobibero
2f33bee2a9 Set openapi schema type to file where possible 2020-09-01 17:26:49 -06:00
Nyanmisaka
12dcd809f9
minor changes 
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2020-09-01 23:53:59 +08:00
Nyanmisaka
5c83dbd0c4
update as per suggestions 2020-09-01 23:39:19 +08:00
Bond-009
8ee042483a
Merge pull request #2888 from ConfusedPolarBear/quickconnect 
Add quick connect (login without typing password)
 2020-08-31 23:01:27 +02:00