Commit Graph

538 Commits

Author SHA1 Message Date
crobibero
becd3b1542 Merge remote-tracking branch 'upstream/master' into mad-stylez 2020-09-04 08:49:06 -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
3be12a9d38 replace swagger logo 2020-09-03 21:39:50 -06: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
crobibero
4df47dea47 Use efcore library for health check 2020-09-03 13:44:49 -06:00
Patrick Barron
d814302707 Merge branch 'master' into scoped-displaypreferences 2020-09-03 15:15:43 -04: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
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
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
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
Claus Vium
993c46f98d Remove custom CORS OPTIONS handling 2020-09-03 14:05:16 +02:00
Claus Vium
2f79c3095b Fix startup message 2020-09-03 11:54:38 +02:00
Claus Vium
571d0570f5 Kill HttpListenerHost 2020-09-03 11:32:22 +02:00
Claus Vium
6ff372a550 Add Https port to service collection 2020-09-03 00:38:52 +02:00
Claus Vium
5813f8073c Move HttpListenerHost middleware up the pipeline 2020-09-03 00:32:56 +02:00
crobibero
1feee6f95e Properly host static files and set base url 2020-09-02 08:03:15 -06:00
crobibero
0b38ac9a8a Fix apidoc routes with base url 2020-09-01 12:53:19 -06:00
crobibero
95402df884 Merge remote-tracking branch 'upstream/master' into default-http-client 2020-08-31 10:32:28 -06:00
Bond-009
95142643f6
Merge pull request #3871 from Ullmie02/plugins-api
Allow plugins to define their own api endpoints
2020-08-31 18:28:11 +02:00
David Ullmer
7f79f2ee0e Use .Distinct on assembly 2020-08-31 17:53:55 +02:00
crobibero
e48df7da5e Only create product header once 2020-08-31 09:15:20 -06:00
crobibero
808d180be4 Fix user agent comment 2020-08-31 08:52:21 -06:00
crobibero
64a811d783 use named http clients 2020-08-31 08:47:38 -06:00
crobibero
5d528e202f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:10:15 -06:00
crobibero
bd66fd25df Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:00:05 -06:00
Cromefire_
3453b65444
Fixed wrong openapi auth header value 2020-08-30 00:44:33 +02:00
crobibero
ec8967b8e6 Fix partial library and channel access 2020-08-27 10:00:06 -06: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
crobibero
de4cfa2234 Apply suggestions from code review 2020-08-26 08:45:59 -06:00
crobibero
78ae86b86a Apply suggestions from code review 2020-08-26 08:23:35 -06:00
crobibero
8b96881aa1 Clean up json Converters 2020-08-26 08:22:48 -06:00
crobibero
582c016d3b bump to preview8 and remove extra references 2020-08-25 21:19:55 -06:00
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06: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
crobibero
9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
crobibero
340f83c3f5 Ignore null json values 2020-08-23 07:48:12 -06:00
crobibero
2ca8d31b20 clean up output formatters 2020-08-20 11:17:27 -06:00
Patrick Barron
98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
crobibero
0db0e8b944 Remove unused configure 2020-08-19 06:39:29 -06:00
crobibero
c5a9e8f831 Merge remote-tracking branch 'upstream/master' into default-http-client 2020-08-19 06:37:06 -06:00
crobibero
7578dfac25 Remove unused directives 2020-08-19 06:36:10 -06:00