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

365 Commits

Author SHA1 Message Date
Claus Vium
a29f702432
Merge pull request #6258 from gnuyent/feat/hardware-encode-status 2021-08-11 12:54:27 +02:00
Bond_009
8528e9bddb Improve platform checks 2021-07-12 20:21:51 +02:00
Brandon Nguyen
d0c5e25ec0 Use nullable enum type instead of strings 2021-07-05 16:52:52 -07:00
Brandon Nguyen
df17c67f11 Use hardware encoding string over boolean 2021-07-03 15:29:07 -07:00
Brandon Nguyen
7e3c94d094 Add hardware encoding status to playback data 
Resolves #6087
 2021-07-03 01:12:09 -07: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
Cody Robibero
9154f20b34
Don't dispose managed CancellationTokenSource (#6139) 2021-06-04 14:36:58 +02:00
Bond-009
d61530eb4b
Merge pull request #6083 from Bond-009/nullable4 
Enable nullable reference types for Emby.Server.Implementations
 2021-05-21 13:05:03 +02:00
Patrick Barron
b6446c06ee Merge branch 'master' into authenticationdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
 2021-05-21 00:19:07 -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
Bond_009
56ac64e70a Minor improvements 
* properly dispose CancellationTokenSource
* rewrite DynamicHlsController.GetSegmentLengths
* remove dead code
 2021-05-08 00:33:24 +02:00
Bond_009
ddb04dc12b Use new ReadAllLines extensions 2021-05-06 14:12:43 +02: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
cvium
ba2e346d12 prevent cancellationtoken leakage 2021-04-30 15:27:07 +02:00
Bond-009
eeb5d4bd1e
Merge pull request #5842 from BaronGreenback/optimization 
Code Clean up: Group Methods
 2021-04-29 21:14:57 +02:00
Bond-009
184e05aeb6
Merge pull request #5681 from BaronGreenback/ContentFeatureOptimization 
Various DLNA Optimizations
 2021-04-22 16:45:36 +02:00
Bond-009
d5163b4167
Merge pull request #5877 from Bond-009/circ1 
EncodingHelper: Fix circular dependency
 2021-04-21 15:49:17 +02:00
Bond_009
499bac5185 EncodingHelper: Fix circular dependency 2021-04-20 23:03:36 +02:00
cvium
8933389753 Respect user settings for transcode and remux 2021-04-19 10:49:52 +02:00
BaronGreenback
bc1cc2d04a Remove unused using directives 2021-04-17 11:37:55 +01:00
BaronGreenback
bb6fddde9a Group Methods 2021-04-17 11:19:09 +01:00
Patrick Barron
8607b52541 Make device/session code async 2021-04-10 16:57:25 -04:00
Ian Walton
321e383965 Fix setting audio stream in PlaybackInfo for jellyfin-web. 2021-04-09 19:24:41 -04:00
Bond-009
ec0ef1530c
Merge pull request #5602 from Ullmie02/IP-string-IP 2021-04-03 00:32:43 +02:00
BaronGreenback
d9a50cb510 Various DLNA Optimizations 2021-04-02 19:06:38 +01:00
Szymon Acedański
b1e8a8565f
Update Jellyfin.Api/Helpers/FileStreamResponseHelpers.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-03-24 22:46:08 +01:00
Szymon Acedański
136136dea9 Fix incorrect responses for HEAD /audio/<id>/stream 
Without this fix my Samsung Soundbar (HW-Q80R) fails to play using DLNA
and returns "Error: Resource not found (716)" instead.

I had a look on tcpdump network logs between Jellyfin and the soundbar
and noticed that the device performs a HEAD request for the media before
responding to the DLNA UPNP control request from Jellyfin (or BubbleUPNP
Android App).

Jellyfin retuns 204 No Content response, which is unusual.  Common web
servers generally return 200 OK if the GET would return content, and
this is not-very-clearly suggested [in HTTP
spec](https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.2.1)

The other patch is to ensure, that invalid Content-Length: 0 is not
returned with the HEAD response in the streaming case.

I think in both cases we still don't return the same headers with HEAD
as with GET (e.g. Content-Length or Accept-Ranges), but at least we
don't return anything misleading.
 2021-03-24 20:43:54 +01:00
David
19e4ef82dd Remove conversion from IPAddress to string to IPAddress 2021-03-23 17:16:10 +01:00
Claus Vium
5592967497
Merge pull request #5403 from BaronGreenback/DLNAProfileFix 2021-03-10 11:50:08 +01:00
BaronGreenback
84da57cd48
Update StreamingHelpers.cs 
Updated condition
 2021-03-10 09:07:11 +00:00
David
ece0d67f99 Use FileShare.Read for log files 2021-03-09 17:31:31 +01:00
BaronGreenback
75c9659e05 Fix unreachable code & assign id to each profile. 2021-03-07 14:17:32 +00:00
David
60ffa6f514 Use FileShare.None when creating files 2021-03-07 14:43:28 +01:00
BaronGreenback
d819a1d928
Remove Content-Length header from DLNA HEAD request (#5335) 2021-03-03 15:41:18 +01:00
Joshua M. Boniface
7ece3c5523
Merge pull request #5273 from Bond-009/warn31 2021-02-22 21:00:46 -05:00
Bond_009
eba859e33e Minor improvements 2021-02-21 02:49:52 +01:00
Bond_009
141efafd3d Enable TreatWarningsAsErrors for MediaBrowser.Model 2021-02-20 23:29:33 +01:00
dkanada
13d65318eb
Merge pull request #5223 from Bond-009/minor10 
Minor improvements
 2021-02-20 10:56:55 +09:00
Bond_009
e9f22303a4 Properly forward cancellationTokens 2021-02-15 14:19:17 +01:00
Bond_009
65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
crobibero
223b42aed3 Create BaseItemKind enum 2021-02-10 17:09:23 -07:00
Claus Vium
63be326302
Merge pull request #5117 from jellyfin/fix-framerate-locale 
Make FRAME-RATE field culture invariant
 2021-01-28 15:35:23 +01:00
nyanmisaka
3ce0d589ba make FRAME-RATE field culture invariant 2021-01-28 01:00:55 +08:00
Bond-009
4a2678e63b
Merge pull request #5097 from Bond-009/cleanup4 
Remove useless abstraction and clean up formatting
 2021-01-26 17:44:49 +01:00
Bond_009
f6b293203a
Restore weird behaviour 2021-01-24 17:55:25 +01:00
Bond_009
1c2cd7efa0
Remove useless abstraction and clean up formatting 2021-01-24 13:32:29 +01:00
Bond_009
d24e7f60c7
Fix GetOrderBy and add tests 2021-01-24 11:43:05 +01:00
crobibero
55670b91b2 Use ArrayModelBinder for sortBy and sortOrder 2021-01-23 17:32:13 -07:00
BaronGreenback
11700db312
Update StreamingHelpers.cs 
Null exception fix
 2021-01-01 00:25:47 +00:00
crobibero
ca5c20c988 Remove IIsoMounter and IsoMounter 2020-12-03 07:34:15 -07:00
Joshua M. Boniface
a6199f821b
Merge pull request #4169 from stanionascu/bdiso-playback 
Playback (direct-stream/transcode) of BDISO/BDAV containers
 2020-12-01 22:36:04 -05:00
Greenback
e41d1773ba changes 2020-11-21 16:14:03 +00:00
Greenback
616caca2b7 Added more comments. 2020-11-21 13:27:27 +00:00
BaronGreenback
7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00: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
nyanmisaka
b4598bd71b Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-20 10:01:17 +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
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
nyanmisaka
51dab0958d changes per suggestions 2020-11-19 22:46:02 +08: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
e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
Bond_009
4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
crobibero
3cc0dd7e12 Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids usage. 2020-11-16 20:29:46 -07:00
BaronGreenback
d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
nyanmisaka
099563cd6b comply with dotnet-5 2020-11-16 12:56:37 +08: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
3f313206c6 Suggestions from review 2020-11-15 11:35:36 -07:00
Bond_009
c4bb32f259
Access last element by index where possible 2020-11-14 20:28:14 +01:00
Bond_009
bc7359f87d
Use string.Split(char) where possible instead of string.Split(char[]) 2020-11-14 20:27:48 +01:00
crobibero
73d2cb1c2a Updated based on review feedback 2020-11-13 18:04:06 -07: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
nyanmisaka
5bd0c2b69d add an option to disable hevc encoding 2020-11-12 11:02:56 +08:00
Claus Vium
a7b3880d0e
Merge branch 'master' into fix_and_mildly_improve_similar 2020-11-11 10:47:18 +01:00
nyanmisaka
57e5b59b93 adjust bitrate limit for HLS audio codecs 2020-11-11 17:10:08 +08: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
2ce9a56cae Remove GetImageTypes 2020-11-09 15:01:30 -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
babb298b90 fix ci 2020-11-08 09:35:04 +00: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
nyanmisaka
5048719a64 minor changes per suggestions 2020-11-08 09:01:58 +00:00
Claus Vium
c17f84ae48
Merge pull request #4330 from crobibero/api-key-auth 
Fix ApiKey authentication
 2020-11-08 08:20:50 +01: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
b21919c7f4 Minor perf improvements 2020-11-06 16:15:30 +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
Bond-009
53b2a2ee22
Merge pull request #4213 from cvium/progressivefilestream 
Add ProgressiveFileStream
 2020-11-03 09:47:17 +01: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
Bond-009
9e9431d829
Merge pull request #4384 from nyanmisaka/ios-hls-bitrate 
Fix HLS music playback on iOS
 2020-10-28 16:29:34 +01:00
crobibero
981f000437 Use proper IsApiKey flag 2020-10-28 08:40:11 -06:00
nyanmisaka
c91f42c7a0 Default output audio bitrate to 128k 2020-10-28 22:27:08 +08:00
Stan
3bb8884e16
Merge branch 'master' into bdiso-playback 2020-10-28 13:18:05 +01: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
Cody Robibero
163d6b0f1d
Update Jellyfin.Api/Helpers/RequestHelpers.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-10-11 06:15:55 -06:00
crobibero
2eafbc03e4 fix build 2020-10-09 18:01:12 -06:00
crobibero
27e753ddb4 Convert image type string to enum. 2020-10-09 17:52:39 -06:00
crobibero
549f2284ad Convert filters string to enum. 2020-10-09 17:41:17 -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
BaronGreenback
7f1ec1b569
Update MediaInfoHelper.cs 2020-10-04 10:03:34 +01:00
BaronGreenback
eaf684a68c
Update DynamicHlsHelper.cs 2020-10-04 10:02:35 +01:00
KonH
211c9cd608 Remove unnecessary null checks in some places 
Related to https://github.com/jellyfin/jellyfin/issues/2149
 2020-10-03 22:03:23 +07:00
Stanislav Ionascu
cd4641dca0 Remove PlayableStreamFileNames as unused 
Since ffmpeg can play and transcode ISO files and BDMV folders directly,
there's no use of that property.
 2020-10-01 22:20:34 +02:00
Stanislav Ionascu
3ad6232973 Add probe / direct-stream / transcoding support for BluRays 
This commit (and ffmpeg built with libbluray support), adds support
for playback of bluray images (bd-iso) and bluray folders.
 2020-10-01 21:59:57 +02:00
cvium
146cad6150 Remove EOF counter 2020-09-26 19:03:23 +02:00
cvium
6ca313abc1 Add ProgressiveFileStream 2020-09-25 23:59:17 +02:00
Jim Cartlidge
5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
Anthony Lavado
25bfef58fc
Merge pull request #4187 from BaronGreenback/FFMPegErrorMsg 
Fix for #4184 when no FFMPEG path set.
 2020-09-23 10:05:14 -04:00
BaronGreenback
bbf196c7bd
Update TranscodingJobHelper.cs 2020-09-19 16:44:35 +01:00
BaronGreenback
9fc1a8b619
Inverted if statement 2020-09-17 18:20:27 +01: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
cvium
cb173d79e6 Fix the test 2020-09-10 14:30:33 +02:00
cvium
7576824cee Standardize use of IsLocal and RemoteIp 2020-09-10 14:16:41 +02:00
BaronGreenback
15e064cb73
Update StreamingHelpers.cs 2020-09-05 22:09:21 +01:00
BaronGreenback
f7a56f70c6
Update StreamingHelpers.cs 2020-09-05 21:31:23 +01:00
BaronGreenback
3c13489cb9
Update StreamingHelpers.cs 2020-09-05 21:31:05 +01:00
BaronGreenback
25e965b85c
Update FileStreamResponseHelpers.cs 2020-09-05 20:33:18 +01:00
BaronGreenback
d3e8834e80
Removed memoryStream 2020-09-05 20:03:21 +01:00
BaronGreenback
ac7636ea1e
added dlnaheaders 
fix for #4059
 2020-09-05 19:54:48 +01:00
David
4836f14aff Enable HTTP Range Processing 2020-09-05 10:38:16 +02:00
crobibero
fb422ff741 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 07:46:52 -06:00
crobibero
dd078e7b82 use named client 2020-08-31 11:05:21 -06:00
Bond-009
32f8b46040 Fix incorrect usage of ArrayPool 2020-08-31 11:09:41 +02:00
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Anthony Lavado
634ee2d1e9
Merge pull request #3861 from crobibero/fixes 
API Fixes
 2020-08-19 08:17:03 -04:00
Cody Robibero
3a722740ce
Update Jellyfin.Api/Helpers/MediaInfoHelper.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2020-08-19 04:53:25 -06:00
crobibero
4ec1341c8f Fix conflicts 2020-08-17 15:54:51 -06:00
crobibero
be67528958 add disposal docs 2020-08-17 15:03:45 -06:00
crobibero
767c73e5c1 fix usings 2020-08-17 13:22:42 -06:00
crobibero
c5e9cf15f6 Use proper IHttpContextAccessor 2020-08-10 07:53:32 -06:00
crobibero
460c3dd351 convert dependent controller functions to di helper class 2020-08-09 17:20:14 -06:00
crobibero
1535f363b2 Fix some request parameters 2020-08-03 13:33:43 -06:00
Patrick Barron
6a42a48c09
Merge pull request #3528 from Ullmie02/api-entrypoint 
Make TranscodingJobHelper an IDisposable (api-migration)
 2020-08-03 17:11:24 +00:00
David
3f0c0e2d0d Implement IDisposable 2020-08-01 16:21:48 +02:00
David
b717ecd5e0 Move methods to the right class 2020-08-01 16:12:22 +02:00
crobibero
f645e2f884 Move DynamicHlsService to Jellyfin.Api 2020-07-31 15:09:17 -06:00
Patrick Barron
2cb6eb984b
Merge pull request #3764 from Ullmie02/api-videohls 
Move VideoHlsService to Jellyfin.Api
 2020-07-31 18:25:54 +00:00
crobibero
c97372a133 Add missing docs and remove duplicate function 2020-07-31 09:21:33 -06:00
crobibero
9171e904de Merge remote-tracking branch 'upstream/api-migration' into api-video 2020-07-31 09:19:02 -06:00
David
8a016e31f7 Move VideoHlsService to Jellyfin.Api 2020-07-31 17:09:10 +02:00
crobibero
f543a17d1b Apply review fixes 2020-07-30 06:29:06 -06:00
crobibero
5c4b342323 fix boolean 2020-07-29 14:21:32 -06:00
crobibero
d0ce239e3e Use ArrayPool and reduce duplicate code 2020-07-29 12:12:54 -06:00
crobibero
03f15fc0ef use proper os comparison 2020-07-29 09:28:53 -06:00
crobibero
b8d327889b Add missing functions 2020-07-27 13:42:40 -06:00
David Ullmer
4aa0bd064f Move HlsSegmentService to Jellyfin.Api 2020-07-27 09:47:19 +02:00
David
ca3dcc3db0 Fix suggestions from review 2020-07-24 19:14:53 +02:00
David
d39f481a5c Apply suggestions from review 2020-07-23 12:46:54 +02:00
David
cff9772e14 Fix build part 2 2020-07-22 20:13:51 +02:00
David
1cb20f9181 Fix build 2020-07-22 19:44:17 +02:00
David
2ce97c022e Move AudioService to Jellyfin.Api 2020-07-22 16:57:06 +02:00
David
90039e1ad3 Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio 
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs
 2020-07-22 11:02:44 +02:00
David
eae665a9c4 Add properties to StreamState to fix some errors 2020-07-22 10:57:27 +02:00
David
07e56850be Remove caching and content length 2020-07-22 10:39:48 +02:00
crobibero
5c66f9e471 changes from merge 2020-07-20 14:43:54 -06:00
David
3514813eb4 Continute work 2020-07-19 19:03:48 +02:00
David
2328ec59c9 Migrate AudioService to Jellyfin.Api 2020-07-11 11:15:04 +02:00
crobibero
5d34b07d1f Make query parameters nullable or set default value 2020-07-07 09:10:51 -06:00
crobibero
1bf131c109 remove duplicate functions 2020-07-06 10:02:16 -06:00
crobibero
b2e7a4a1cb Merge remote-tracking branch 'upstream/api-migration' into api-channel 2020-07-06 10:00:23 -06:00
crobibero
13c4cb628f add missing function after merge 2020-06-30 18:03:04 -06:00
crobibero
14faebc7fe Merge remote-tracking branch 'upstream/api-migration' into api-livetv 2020-06-30 17:53:20 -06:00
David
5dfe1ed9b3 Fix using ordering 2020-06-30 15:01:08 +02:00
David
6385e1ba46 Fix Build 2020-06-30 14:36:45 +02:00
David
94e792e0d7 Merge branch 'api-migration' of github.com:Ullmie02/jellyfin into api-migration 2020-06-30 14:34:48 +02:00
crobibero
da40572979 Merge remote-tracking branch 'upstream/api-migration' into api-studios 2020-06-29 12:54:47 -06:00
David
45e034e9a1 Move ArtistsService to Jellyfin.Api 2020-06-29 16:34:00 +02:00
Patrick Barron
dbf939467f
Merge pull request #3466 from crobibero/api-migration-nullable 
Make all optional strings nullable
 2020-06-28 23:59:21 +00:00
crobibero
73bcda7eac Make all optional strings nullable 2020-06-27 10:50:44 -06:00
crobibero
f45d44f321 Move PlaystateService.cs to Jellyfin.Api 2020-06-26 21:04:02 -06:00
Patrick Barron
90c01327aa
Merge pull request #3433 from crobibero/api-years 
Move YearsService to Jellyfin.Api
 2020-06-26 20:09:54 +00:00
crobibero
325808d271 Move StudiosService.cs to Jellyfin.Api 2020-06-25 18:22:55 -06:00
David
fa98013621 Move AlbumsService to Jellyfin.Api 2020-06-25 13:23:54 +02:00
crobibero
e72a22c564 Move YearsService.cs to Jellyfin.Api 2020-06-24 13:48:22 -06:00
crobibero
fb81f95ae8 fix duplicate function 2020-06-24 12:49:09 -06:00
crobibero
289605c07f Merge remote-tracking branch 'upstream/api-migration' into api-library 2020-06-24 12:36:13 -06:00
crobibero
fee07219d0 fix merge 2020-06-24 10:54:25 -06:00
crobibero
cbcf3bfaff Merge remote-tracking branch 'upstream/api-migration' into api-channel 2020-06-24 10:52:39 -06:00
crobibero
c4f9112b0d Move LiveTvService.cs to Jellyfin.Api 2020-06-23 11:48:37 -06:00
crobibero
f35774170f Move LiveTvService.cs to Jellyfin.Api 2020-06-21 16:12:21 -06:00
crobibero
38788a1f1d Merge remote-tracking branch 'upstream/api-migration' into api-library 2020-06-21 11:34:05 -06:00
crobibero
d1ca0cb4c7 Use proper DtoOptions extensions 2020-06-20 16:03:19 -06:00
David Ullmer
d4c86b82e0 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-sessionservice 
# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
 2020-06-20 20:45:16 +02:00