Commit Graph

924 Commits

Author SHA1 Message Date
Stan
3bb8884e16
Merge branch 'master' into bdiso-playback 2020-10-28 13:18:05 +01: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
dkanada
5c2ecc0ca5
Merge pull request #4324 from crobibero/dotnet-3.1.9
Update to dotnet 3.1.9
2020-10-15 12:56:10 +09:00
crobibero
c037d3536d clean up authorization handlers 2020-10-14 17:58:46 -06:00
crobibero
39924f9992 Allow apikey to authenticate as admin 2020-10-14 17:58:33 -06:00
crobibero
f2a86d9c80 Remove CommaDelimitedArrayModelBinderProvider 2020-10-14 13:03:36 -06:00
crobibero
f998e52107 Update to dotnet 3.1.9 2020-10-13 18:50:04 -06: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
dkanada
ddce3ef6be
Merge pull request #4301 from crobibero/fix-array-binder
Fix comma delimited array model binder
2020-10-11 18:33:53 +09: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
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
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
crobibero
17b20aa0c0 Fix comma delimited array model binder 2020-10-09 17:03:45 -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
dkanada
3a238de35e
Merge pull request #4265 from KonH/remove_unnecessary_null_checks
Remove unnecessary null checks in some places
2020-10-06 13:04:54 +09:00
Bond-009
e011659186
Merge pull request #4210 from nielsvanvelzen/typed-websocket-message
Use enum for WebSocket message types
2020-10-05 10:40:52 +02:00
Patrick Barron
4d7e7d6331 Rewrite activity log backend to use a query class. 2020-10-04 20:29:28 -04:00
BaronGreenback
7f1ec1b569
Update MediaInfoHelper.cs 2020-10-04 10:03:34 +01:00
BaronGreenback
5360f5a43d
Update UserController.cs 2020-10-04 10:03:08 +01:00
BaronGreenback
bb4c668650
Update LocalAccessHandler.cs 2020-10-04 10:02:52 +01:00
BaronGreenback
eaf684a68c
Update DynamicHlsHelper.cs 2020-10-04 10:02:35 +01:00
BaronGreenback
b5ea16cf7b
Update LocalAccessOrRequiresElevationHandler.cs 2020-10-04 10:02:13 +01:00
BaronGreenback
168a4ec2f2
Update IgnoreParentalControlHandler.cs 2020-10-04 10:01:56 +01:00
BaronGreenback
34ef6492ee
Update FirstTimeOrIgnoreParentalControlSetupHandler.cs 2020-10-04 10:01:32 +01:00
BaronGreenback
a3a2ca412b
Update DownloadHandler.cs 2020-10-04 10:01:10 +01:00
BaronGreenback
04552e86fb
Update DefaultAuthorizationHandler.cs 2020-10-04 10:00:51 +01:00
Matt Montgomery
7cec65b973 Update documentation 2020-10-03 14:35:57 -05: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
github@esslinger.dev
33f80dc3c1 feat(CommaDelimitedArrayModelBinder): add none result check 2020-10-03 01:09:15 +02: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
21b39a207d
refactor: simplify null check
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-10-02 01:33:15 +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
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
github@esslinger.dev
4b4c74bdcd feat: extend CommaDelimitedArrayModelBinder to support auto generated openAPI spec 2020-10-01 22:04:53 +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
BaronGreenback
02de44ec0c
Update BaseAuthorizationHandler.cs 2020-10-01 20:54:39 +01:00
github@esslinger.dev
ba12ea7f4a feat: use CommaDelimitedArrayModelBinder to retain API 2020-10-01 19:57:31 +02:00
github@esslinger.dev
0655928ab1 feat: add CommaDelimitedArrayModelBinder 2020-10-01 19:56:59 +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
Bond-009
cbf9be9416
Merge pull request #3577 from crobibero/package-install-repo
Specify plugin repo on plugin installation
2020-09-29 18:24:11 +02:00
dependabot[bot]
a26ff86553
Bump Swashbuckle.AspNetCore from 5.5.1 to 5.6.3
Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 5.5.1 to 5.6.3.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v5.5.1...v5.6.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-28 14:50:39 +00:00
dependabot[bot]
61c1bdb6df
Bump Swashbuckle.AspNetCore.ReDoc from 5.5.1 to 5.6.3
Bumps [Swashbuckle.AspNetCore.ReDoc](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 5.5.1 to 5.6.3.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v5.5.1...v5.6.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-28 12:00:38 +00:00
Niels van Velzen
72534f9d66 Use SessionMessageType for WebSocket messages 2020-09-27 10:00:20 +02:00
crobibero
b7022e8dc1 Merge remote-tracking branch 'upstream/master' into package-install-repo 2020-09-26 16:57:53 -06: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
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
25bfef58fc
Merge pull request #4187 from BaronGreenback/FFMPegErrorMsg
Fix for #4184 when no FFMPEG path set.
2020-09-23 10:05:14 -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
dkanada
dfb2ef5cfe
Merge pull request #4126 from crobibero/3.1.8
update to dotnet 3.1.8
2020-09-23 19:52:37 +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
bbf196c7bd
Update TranscodingJobHelper.cs 2020-09-19 16:44:35 +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
9fc1a8b619
Inverted if statement 2020-09-17 18:20: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
crobibero
46ae51bc9a update to dotnet 3.1.8 2020-09-12 10:19:04 -06: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
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
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
Bond-009
c585af3177
Merge pull request #4063 from BaronGreenback/FilestreamResponse
Our of Memory fix when streaming large files
2020-09-07 20:00:23 +00: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
Bond-009
99bbbea9e2
Merge pull request #4069 from crobibero/api-route-required
Make all FromRoute required
2020-09-06 21:31:08 +02: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
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
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
021e218f75 Remove MvcRoutePrefix 2020-09-04 07:58:27 -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
1d3303fa0a Move json profiles to constant strings. 2020-09-03 12:15:24 -06: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
5ad81f7fe6 Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-09-03 09:29:07 -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
Anthony Lavado
43a81366a6
Merge pull request #4022 from Bond-009/arraypool
Fix incorrect usage of ArrayPool
2020-08-31 15:58:53 -04:00
crobibero
dd078e7b82 use named client 2020-08-31 11:05:21 -06:00
crobibero
5d528e202f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:10:15 -06:00
Bond-009
1b1de4026d
Merge pull request #4028 from crobibero/cache-duration
Properly verify cache duration
2020-08-31 16:04:04 +02:00
crobibero
bd66fd25df Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:00:05 -06:00
Bond-009
1f4deccfa4
Merge pull request #4027 from cvium/fix_update_libraryoptions
Fix model binding in UpdateLibraryOptions
2020-08-31 15:44:47 +02:00
crobibero
db99903c35 Properly verify cache duration 2020-08-31 07:24:23 -06:00
Claus Vium
7103e764a4 Fix model binding in UpdateLibraryOptions 2020-08-31 14:47:57 +02:00
Bond-009
32f8b46040 Fix incorrect usage of ArrayPool 2020-08-31 11:09:41 +02:00
Bond-009
9a2f2aac22
Merge pull request #4018 from barronpm/library-entity-cleanup
Library Entity Cleanup
2020-08-31 11:00:28 +02:00
Patrick Barron
414bedbde4 Move library entities to folder. 2020-08-30 18:51:28 -04:00
PrplHaz4
34219e2831
Fix permissions for individual channel plugins #2858
Without this change, the only Channel (plugin, not Live TV) permission that works is "Enable All Channels".

Fixes #2858
2020-08-27 10:12:32 -04:00
Bond-009
4f6c98b325
Merge pull request #3984 from crobibero/json-prerelease
Use Prerelease System.Text.Json
2020-08-26 18:59:46 +02:00
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
crobibero
582c016d3b bump to preview8 and remove extra references 2020-08-25 21:19:55 -06:00
Joshua M. Boniface
cf6ef9958d
Merge pull request #3910 from barronpm/event-rewrite-1
Event Rewrite (Part 1)
2020-08-25 16:59:35 -04:00
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Patrick Barron
fa8892fde4 Make LibraryController.GetDownload async 2020-08-24 20:27:10 -04:00
Patrick Barron
9fa4fff15d Merge branch 'master' into event-rewrite-1
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
2020-08-24 20:04:13 -04:00
nyanmisaka
d7caf88df6 expose max_muxing_queue_size to user 2020-08-25 02:20:46 +08:00
nyanmisaka
6462ca0036 increase the max muxing queue size for ffmpeg 2020-08-24 22:54:14 +08:00
crobibero
9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
crobibero
cb44f16068 Merge remote-tracking branch 'upstream/master' into output-formatters 2020-08-23 07:53:33 -06:00
Bond-009
92c491397e
Merge pull request #3941 from crobibero/no-more-form
Conver all remaining form request to body
2020-08-22 13:06:12 +02:00
Joshua M. Boniface
3e65cae70e
Merge pull request #3955 from Bond-009/async3
Make some methods async
2020-08-21 18:03:07 -04:00
Bond_009
4916bfb024 Address comment 2020-08-21 22:59:47 +02:00
Bond_009
2b832de289 Fix build 2020-08-21 22:19:16 +02:00
Bond_009
6329a36a27 Make method async 2020-08-21 22:06:06 +02:00
Bond_009
119f64f5e7 Make some methods async 2020-08-21 22:01:19 +02:00
crobibero
4a64819277 Fix dlna produces type 2020-08-21 11:10:29 -06:00
crobibero
07e7125d07 Fix dlna play to 2020-08-21 07:24:44 -06:00
Bond_009
170e434f92 Fix all warnings in Emby.Dlna 2020-08-20 21:04:57 +02:00
crobibero
2ca8d31b20 clean up output formatters 2020-08-20 11:17:27 -06:00
Nyanmisaka
05e78ee78c
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-08-20 22:53:36 +08:00
crobibero
d63f4bce5d Conver all remaining form request to body 2020-08-20 07:53:53 -06:00
Bond-009
250e351613
Merge pull request #3938 from crobibero/fix-audio-routes
Fix conflicting audio routes
2020-08-20 10:52:28 +02:00
nyanmisaka
dd3b48f203 fix lint 2020-08-20 15:17:42 +08:00
Patrick Barron
98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
crobibero
11e3cdb3cb Fix conflicting audio routes 2020-08-19 15:08:28 -06:00
Nyanmisaka
16658c92fe
fix SubtitlesOctopus 2020-08-20 00:08:44 +08:00
Nyanmisaka
53861db451
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-08-20 00:04:55 +08:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02: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
nyanmisaka
988e76d4c7 update endpoints as AspNet controllers 2020-08-19 17:30:22 +08:00
crobibero
50a9c8c8a7 resolve merge conflicts 2020-08-18 20:22:15 -06:00
crobibero
b90e240af6 rename clientCapabilities 2020-08-18 07:29:39 -06:00
crobibero
287baa4965 remove unused directives 2020-08-18 07:29:12 -06:00
Matt Montgomery
1ff4f8e6c6 Get userId from claim 2020-08-17 18:55:16 -05:00
Matt Montgomery
5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
crobibero
4ec1341c8f Fix conflicts 2020-08-17 15:54:51 -06:00
crobibero
29d8e38161 Merge remote-tracking branch 'upstream/master' into fixes 2020-08-17 15:54:40 -06:00
crobibero
be67528958 add disposal docs 2020-08-17 15:03:45 -06:00
crobibero
3a91047413 P E R F O R M A N C E 2020-08-17 14:59:00 -06:00
crobibero
9c6b4f033a revert lastordefault 2020-08-17 14:55:14 -06:00
crobibero
898ccab222 oop 2020-08-17 13:41:16 -06:00
crobibero
767c73e5c1 fix usings 2020-08-17 13:22:42 -06:00
crobibero
1325815182 Remove IHttpClient from Providers 2020-08-17 13:10:02 -06:00
Bond-009
d0f49b3994
Merge pull request #3895 from crobibero/httpclient
Remove IHttpClient from Jellyfin.Api
2020-08-17 10:47:45 +02:00
Matt Montgomery
c49a357f85 Fix compile errors 2020-08-16 17:45:53 -05:00
ConfusedPolarBear
eaa5711534
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-08-16 17:21:08 -05:00
Matt Montgomery
035d29fb35 Migrate to new API standard 2020-08-16 14:45:39 -05:00
crobibero
7861c72754 Revert "Fix audio stream routes"
This reverts commit 0c50015400.
2020-08-16 11:47:26 -06:00
crobibero
0c50015400 Fix audio stream routes 2020-08-16 11:34:41 -06:00
crobibero
8da646e12b Dispose httpclient response 2020-08-16 10:57:01 -06:00
crobibero
3c395814fd fix dlna routes again 2020-08-16 10:53:57 -06:00
crobibero
8ddcd12348 Remove all using for HttpClient 2020-08-16 09:47:08 -06:00
crobibero
7fe372749e fix dlna server routes 2020-08-16 08:32:13 -06:00
crobibero
5e6cdc8842 Install specific plugin version if requested 2020-08-14 08:54:21 -06:00
Patrick Barron
ca1f15af19 Move GenericEventArgs to Jellyfin.Data.Events 2020-08-13 20:52:55 -04:00
crobibero
97fd11c9a4 Remove httpclient from Jellyfin.Api 2020-08-13 15:50:19 -06:00
Patrick Barron
da9bcc5fb3 Rename IEventManager to IDlnaEventManager 2020-08-13 15:47:31 -04:00
Anthony Lavado
5480674c4f
Merge pull request #3838 from Bond-009/memorystream
MemoryStream optimizations
2020-08-13 13:01:43 -04:00
crobibero
6709645ec9 bump deps 2020-08-12 15:52:29 -06:00
crobibero
687b008d59 fix livetv id check 2020-08-12 14:41:10 -06:00
crobibero
ae1593b590 fix route method 2020-08-12 13:14:42 -06:00
crobibero
afeba4dae7 simplify datetime parsing 2020-08-12 13:07:11 -06:00
crobibero
09bcc38feb Merge remote-tracking branch 'upstream/master' into fixes 2020-08-12 12:47:25 -06:00
crobibero
eb7ab31b5a add support for GetActivityLogs 2020-08-12 12:43:57 -06:00
crobibero
bb08e25f86 userid isn't actually required 2020-08-12 12:43:43 -06:00
Bond-009
b307e0fe09
Merge pull request #3872 from crobibero/user-policy
Fix setting user policy
2020-08-11 10:12:07 +02:00
Mister Rajoy
c7b5bc55a1 Fix MergeVersions() 2020-08-10 20:33:11 +02:00
crobibero
3ba1f4c901 add proper converter for legacy datetime 2020-08-10 12:02:14 -06:00
crobibero
b0532c549a add proper converter for legacy datetime 2020-08-10 11:58:06 -06:00
crobibero
4b87bbf53d fix route 2020-08-10 11:38:02 -06:00
crobibero
2f853b902a fix datetime parsing 2020-08-10 11:33:42 -06:00