Commit Graph

17934 Commits

Author SHA1 Message Date
crobibero d5eb246557 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-04 16:42:40 -06:00
Anthony Lavado d8c6d29182
Merge pull request #4053 from thornbill/fix-aac-mime-type
Fix aac mime-type
2020-09-04 18:39:04 -04:00
Anthony Lavado 6152d40303
Merge pull request #4030 from crobibero/http-client-migrate
Remove IHttpClient
2020-09-04 18:38:39 -04:00
Bill Thornton b065f5db1d Fix aac mime-type 2020-09-04 17:41:31 -04:00
Joshua M. Boniface 376e4793e6
Merge pull request #4035 from crobibero/api-doc-base-url
Fix apidoc routes with base url
2020-09-04 10:30:13 -04:00
crobibero 23df4991b6 Use proper buffer size 2020-09-04 08:24:21 -06:00
crobibero 2a8653b309 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-04 08:16:49 -06:00
Joshua M. Boniface 559a7fc336
Merge pull request #3442 from nyanmisaka/tonemap
Tonemapping function relying on OpenCL filter and NVENC HEVC decoder
2020-09-04 10:06:15 -04: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
Joshua M. Boniface 945be64ad6
Merge pull request #4048 from crobibero/xml-docs
Remove GenerateDocumentationFile
2020-09-04 09:35:45 -04:00
crobibero 583f47ea28 Remove GenerateDocumentationFile 2020-09-04 07:04:06 -06:00
Bond-009 7a03e6d2c6
Merge pull request #3946 from crobibero/output-formatters
Clean up output formatters
2020-09-04 13:15:16 +02:00
Bond-009 5e76d5fd56
Merge pull request #3879 from cvium/fix_theme_songs
Populate ThemeVideoIds and ThemeSongIds
2020-09-04 13:13:39 +02:00
Claus Vium 81c764e87f
Merge branch 'master' into output-formatters 2020-09-04 11:44:15 +02:00
Bond-009 250216cc53
Merge pull request #4047 from crobibero/health-2.0
Use efcore library for health check
2020-09-04 02:24:26 +02:00
crobibero c404660f67 Remove double listener 2020-09-03 18:19:27 -06:00
crobibero ca6dfd7c45 move metrics to end of pipeline 2020-09-03 17:14:50 -06:00
crobibero 4e52fe1060 Wrap application in baseurl 2020-09-03 17:11:12 -06:00
crobibero 7504f067ef fix merge 2020-09-03 16:19:03 -06:00
crobibero 21a5692626 Merge remote-tracking branch 'upstream/master' into api-doc-base-url 2020-09-03 16:18:36 -06:00
Vijay Raghav 1cbe4896e2 Translated using Weblate (Tamil)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ta/
2020-09-03 15:58:15 -04: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
crobibero 4df47dea47 Use efcore library for health check 2020-09-03 13:44:49 -06:00
Anthony Lavado f02bcd9cf8
Merge pull request #3849 from barronpm/scoped-displaypreferences
Make DisplayPreferencesManager Scoped
2020-09-03 15:23:49 -04:00
Patrick Barron d814302707 Merge branch 'master' into scoped-displaypreferences 2020-09-03 15:15:43 -04:00
Nyanmisaka 4cb0a57e46
Merge branch 'master' into tonemap 2020-09-04 02:55:57 +08:00
Joshua M. Boniface 53703566b5
Merge pull request #4008 from crobibero/publish-with-docs
Include xml docs when publishing
2020-09-03 14:46:35 -04:00
Joshua M. Boniface 52aea85e7f
Merge pull request #4031 from Bond-009/warn28
Fix some warnings
2020-09-03 14:40:29 -04:00
Bond-009 9cbc016b0a
Merge pull request #3877 from orryverducci/deinterlace-improvements
Deinterlacing improvements
2020-09-03 20:38:54 +02:00
Bond-009 7582e17377
Merge pull request #3907 from crobibero/dlna
Fix DLNA Routes
2020-09-03 20:38:09 +02:00
Bond-009 388fe236c5
Merge pull request #3932 from crobibero/api-doc-css
Add support for custom api-doc css
2020-09-03 20:37:54 +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
josteinh 22ac6b9a48 Translated using Weblate (Norwegian Nynorsk)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nn/
2020-09-03 12:40:22 -04:00
josteinh a013d3f4f8 Translated using Weblate (Norwegian Bokmål)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nb_NO/
2020-09-03 12:40:22 -04:00
crobibero 82f30a35db Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 10:40:08 -06:00
crobibero 1be84e8873 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-03 10:37:05 -06:00
Bond-009 645db0524f
Merge pull request #4045 from crobibero/health
Add db health check
2020-09-03 18:34:25 +02:00
crobibero 99b2bc8e06 ? 2020-09-03 09:49:08 -06:00
crobibero 12c3039185 Merge remote-tracking branch 'upstream/master' into health 2020-09-03 09:48:19 -06:00
Anthony Lavado 0712a7ef11
Merge pull request #3886 from crobibero/3.1.7
bump deps
2020-09-03 11:47:13 -04:00
crobibero 5ad81f7fe6 Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-09-03 09:29:07 -06:00
crobibero d6594a8a70 Add db health check 2020-09-03 09:26:22 -06:00
crobibero bebb0afb52 Merge remote-tracking branch 'upstream/master' into api-doc-css 2020-09-03 08:06:40 -06:00
Anthony Lavado 3711a1978e
Merge pull request #3874 from danieladov/master
Fix MergeVersions()
2020-09-03 09:47:19 -04:00
crobibero fb422ff741 Merge remote-tracking branch 'upstream/master' into http-client-migrate 2020-09-03 07:46:52 -06:00