Commit Graph

738 Commits

Author SHA1 Message Date
Bond-009
07be066180
Merge pull request #4252 from skyfrk/4214-supported-commands-enum
Convert supportedCommands strings to enums
2020-10-04 22:40:14 +02:00
crobibero
6a32385588 Allow server to return .data files 2020-10-02 13:30:31 -06:00
github@esslinger.dev
9aad772288 feat: implement CommaDelimitedArrayModelBinderProvider 2020-10-02 18:26:48 +02:00
crobibero
2b75af9873 set type of GroupUpdate 2020-10-01 10:40:58 -06:00
crobibero
4a3e0062f9 Add missing PlaystateRequest and remove additional GroupUpdate types 2020-10-01 09:39:57 -06:00
crobibero
5ee6f49204 Manually register models used in websocket messages. 2020-10-01 08:10:47 -06:00
Jim Cartlidge
fcd1b2f0e4 Merged with latest master 2020-09-30 17:52:33 +01:00
Bond-009
c7b3d4a90c
Merge pull request #4164 from spooksbit/remove-browser-auto-load
Removed browser auto-launch functionality
2020-09-29 18:24:58 +02:00
spookbits
c912093579 Created a separate API Docs profile to launch the browser at the API docs, and the nowebclient profile no longer launches the browser at all.
Don't point to web in the client because it won't redirect properly.

Modified the vscode launch.json to automatically launch the browser when debugging the first configuration. The
2020-09-28 16:34:48 -04:00
dependabot[bot]
45faf56085
Bump Serilog.Sinks.Graylog from 2.1.3 to 2.2.1
Bumps [Serilog.Sinks.Graylog](https://github.com/whir1/serilog-sinks-graylog) from 2.1.3 to 2.2.1.
- [Release notes](https://github.com/whir1/serilog-sinks-graylog/releases)
- [Commits](https://github.com/whir1/serilog-sinks-graylog/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-28 12:00:45 +00:00
Jim Cartlidge
5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
spookbits
246ab260f7 Do not implicitly reference ASP.NET Core Analyzers.
Also do not explicitly reference AspNetCore.App (fixes compiler warning).
2020-09-16 17:09:24 -04:00
spooksbit
ac32b14012
Update Jellyfin.Server/Properties/launchSettings.json
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-09-16 15:11:35 -04:00
spookbits
5cca8bffea Removed browser auto-load functionality from the server.
Added profiles in launchSettings to start either the web client or the swagger API page.
Removed --noautorunwebapp as this is the default functionality.
2020-09-16 13:22:04 -04:00
Jim Cartlidge
0ec3633f9e removing whitespace & upgraded library version 2020-09-15 18:09:43 +01:00
BaronGreenback
96c3c4af42
Update IpBasedAccessValidationMiddleware.cs 2020-09-15 13:48:40 +01:00
BaronGreenback
40464a6fdd
Update LanFilteringMiddleware.cs 2020-09-15 13:47:01 +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
288d89493e Fixed testing units. 2020-09-12 17:21:03 +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
Bond-009
6bf0acb854
Merge pull request #4121 from cvium/normalize_app_paths
Normalize application paths
2020-09-11 17:01:58 +00:00
Bond-009
6aa6e33f7d
Merge pull request #4102 from cvium/fix_startup_lan_ip_validation
Skip startup message for /system/ping
2020-09-11 13:28:49 +00:00
cvium
70aa7fe77d Normalize application paths 2020-09-11 10:34:47 +02: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
cvium
78cab77f81 Add Known Proxies to system configuration 2020-09-10 11:05:46 +02:00
crobibero
612e135c8c Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-09 12:02:05 -06:00
Bond-009
b76d4ba454
Merge pull request #4096 from crobibero/auth-ex
Fix catching authentication exception
2020-09-08 11:49:56 +00:00
cvium
3ad176f8e2 Remove unused import 2020-09-08 12:41:59 +02:00
cvium
12bd9ea750 Skip startup message for /system/ping 2020-09-08 12:37:15 +02:00
crobibero
e772756328 Fix catching authentication exception 2020-09-07 20:51:12 -06:00
crobibero
68e5a95fdb Fix redirection 2020-09-07 19:10:14 -06:00
Anthony Lavado
d08ddbb8d2
Merge pull request #4013 from crobibero/dynamic-cors
Allow CORS domains to be configured
2020-09-07 19:41:45 -04:00
dependabot[bot]
37a8be5db2
Bump SQLitePCLRaw.bundle_e_sqlite3 from 2.0.3 to 2.0.4
Bumps [SQLitePCLRaw.bundle_e_sqlite3](https://github.com/ericsink/SQLitePCL.raw) from 2.0.3 to 2.0.4.
- [Release notes](https://github.com/ericsink/SQLitePCL.raw/releases)
- [Commits](https://github.com/ericsink/SQLitePCL.raw/compare/v2.0.3...v2.0.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-07 12:02:16 +00:00
crobibero
eab92a0b01 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-06 14:34:31 -06:00
crobibero
342de39d78 Move CorsPolicyProvider to Jellyfin.Server.Configuration 2020-09-05 13:02:53 -06:00
crobibero
527ffaa90c clean docs 2020-09-05 09:12:50 -06:00
crobibero
2c05d53b06 Convert to ICorsPolicyProvider 2020-09-05 09:10:05 -06:00
crobibero
8a08111adc Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-05 09:00:55 -06:00
crobibero
d5eb246557 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-04 16:42:40 -06:00
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
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
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
1be84e8873 Merge remote-tracking branch 'upstream/master' into api-stream-return 2020-09-03 10:37:05 -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
crobibero
1de22af646 Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-03 07:48:34 -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
65d05f92ac Merge remote-tracking branch 'upstream/master' into dynamic-cors 2020-09-01 18:27:55 -06:00
crobibero
2f33bee2a9 Set openapi schema type to file where possible 2020-09-01 17:26:49 -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
crobibero
e97ccd87fb Remove DynamicCorsMiddleware 2020-08-31 07:21:07 -06:00
crobibero
eba0d9e387 Always allow set credentials header 2020-08-30 10:05:21 -06:00
crobibero
3c0484cc97 Allow for dynamic cors response 2020-08-30 09:32:14 -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
crobibero
076e17f355 Add default http client 2020-08-19 06:31:45 -06:00
crobibero
1d9285c594 add support for custom doc css 2020-08-18 15:52:42 -06:00
crobibero
29d8e38161 Merge remote-tracking branch 'upstream/master' into fixes 2020-08-17 15:54:40 -06:00
Patrick Barron
a77cf53573 Allow plugins to register services. 2020-08-16 17:25:14 -04:00
crobibero
21cc308ec9 Use proper mediatypename 2020-08-16 11:48:54 -06:00
Patrick Barron
ee5d4b1146 Register event services 2020-08-15 15:56:56 -04:00
crobibero
2d4e91c5a2 Add xml output formatter 2020-08-15 10:39:24 -06:00
Anthony Lavado
dbc1435a9e
Merge pull request #3671 from Bond-009/unixsocket
Make UNIX socket configurable
2020-08-13 13:02:02 -04:00
crobibero
6709645ec9 bump deps 2020-08-12 15:52:29 -06:00
David
9e95fe8f9d Add plugin assemblies to mvc builder 2020-08-11 18:20:16 +02:00
crobibero
b0532c549a add proper converter for legacy datetime 2020-08-10 11:58:06 -06:00
David
98d1d2325d Prepare plugin Api migration 2020-08-10 16:12:22 +02:00
Patrick Barron
229a5d9e0b Make DisplayPreferencesManager scoped 2020-08-08 13:39:49 -04:00
Patrick Barron
d886532258 Add DbContext Pool 2020-08-08 13:32:17 -04:00
crobibero
05f9473544 Apply fixes from review 2020-08-06 17:59:48 -06:00
crobibero
fffa94fc33 Apply fixes from review 2020-08-06 08:17:45 -06:00
crobibero
9e00aa3014 fix openapi validation errors 2020-08-03 14:38:51 -06:00
crobibero
f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
dependabot[bot]
be277e74d7
Bump Serilog.AspNetCore from 3.2.0 to 3.4.0
Bumps [Serilog.AspNetCore](https://github.com/serilog/serilog-aspnetcore) from 3.2.0 to 3.4.0.
- [Release notes](https://github.com/serilog/serilog-aspnetcore/releases)
- [Commits](https://github.com/serilog/serilog-aspnetcore/compare/v3.2.0...v3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-03 12:04:18 +00:00
Bond-009
b7421db5fe
Merge pull request #3578 from barronpm/displaypreferences-efcore
Migrate Display Preferences to EF Core
2020-08-01 21:51:49 +02:00
Patrick Barron
ad32800504 Switch to unstable chromecast version. 2020-08-01 14:56:32 -04:00
Patrick Barron
a6bc4c688d Add using statement to DisplayPreferences migration 2020-08-01 14:52:45 -04:00
cvium
5f03fb0ef7 Use factory pattern to instantiate jellyfindb context to avoid disposed contexts piling up in DI container 2020-07-31 10:13:54 +02:00
Patrick Barron
c094916df0 Migrate default library display preferences. 2020-07-28 09:19:25 -04:00
Patrick Barron
4b8ab1a803 Set default value of SortBy during migrations. 2020-07-27 21:01:08 -04:00
Patrick Barron
754837f16f Add tv home. 2020-07-27 20:50:58 -04:00
Patrick Barron
68a185fd02 Serialize/deserialize new entities properly. 2020-07-27 20:40:21 -04:00
crobibero
7bb34fc9e7 use proper HttpClient DI 2020-07-25 17:21:40 -06:00
Patrick Barron
9fcf23bd21 Migrate EnableNextVideoInfoOverlay 2020-07-24 16:34:19 -04:00
Patrick Barron
0d13d830bb Migrate skip lengths. 2020-07-24 16:30:54 -04:00
Patrick Barron
629ffe395f Fixed build errors. 2020-07-23 20:36:36 -04:00
Patrick Barron
3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Bond_009
cbe47325b3 Make UNIX socket configurable 2020-07-23 13:18:47 +02:00
Bond-009
9ffe74d979
Merge pull request #3532 from Ullmie02/socket-binding
Add support for binding to Unix socket
2020-07-23 12:30:25 +02:00
David
0e855953a2
Update Jellyfin.Server/Program.cs
Co-authored-by: Bond-009 <bond.009@outlook.com>
2020-07-23 12:03:46 +02:00
Bond-009
3a9698de54
Merge pull request #3665 from barronpm/use-interfaces
Use interfaces in app host constructors
2020-07-23 10:29:32 +02:00
Patrick Barron
200f369596 Use interfaces in app host constructors 2020-07-22 19:34:14 -04:00
Patrick Barron
9f323e5579 Add missing chromecast version serialization/deserialization. 2020-07-22 14:37:17 -04:00
crobibero
6c076b2162 Try adding plugin repository again 2020-07-21 08:27:12 -06:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
crobibero
9343e73b26 Allow migration to optionally run on fresh install 2020-07-20 07:45:24 -06:00
David
0e1bf316b5 Merge branch 'master' of github.com:jellyfin/jellyfin into socket-binding 2020-07-18 19:21:43 +02:00
Patrick Barron
4742ddbb71 Update .NET Core to 3.1.6 2020-07-17 19:48:11 -04:00
Patrick Barron
ab396225ea Migrate Display Preferences to EF Core 2020-07-17 16:11:53 -04:00
David
fa4e0a73d5
Update Jellyfin.Server/Program.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-16 11:21:46 +02:00
David
262e19b691 Add X-Response-Time-ms header and log slow server response time 2020-07-14 13:40:18 +02:00
Patrick Barron
befd0c7a00 Remove EF Core Proxies 2020-07-13 12:49:20 -04:00
David
7367e667f7 Add socket support 2020-07-11 12:43:30 +02:00
Bond_009
ae6eaa7f02 Minor fixes 2020-07-04 22:06:27 +02:00
Neil Burrows
4389773508 Respect FFMpeg path passed via Environment Variable 2020-06-29 17:17:28 +01:00
crobibero
8d7b39a36e fix endpoint order 2020-06-25 17:44:11 -06:00
crobibero
289605c07f Merge remote-tracking branch 'upstream/api-migration' into api-library 2020-06-24 12:36:13 -06:00
dependabot[bot]
35d80392ec
Bump prometheus-net.AspNetCore from 3.5.0 to 3.6.0
Bumps [prometheus-net.AspNetCore](https://github.com/prometheus-net/prometheus-net) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/prometheus-net/prometheus-net/releases)
- [Changelog](https://github.com/prometheus-net/prometheus-net/blob/master/History)
- [Commits](https://github.com/prometheus-net/prometheus-net/compare/v3.5.0...v3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-22 13:16:21 +00:00
dkanada
a3bc82727a
Merge pull request #3414 from jellyfin/dependabot/nuget/prometheus-net-3.6.0
Bump prometheus-net from 3.5.0 to 3.6.0
2020-06-22 22:11:08 +09:00
dkanada
3d65cbdf07
apply suggestions from code review
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-06-22 21:59:56 +09:00
dependabot[bot]
be4fdd2394
Bump prometheus-net from 3.5.0 to 3.6.0
Bumps [prometheus-net](https://github.com/prometheus-net/prometheus-net) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/prometheus-net/prometheus-net/releases)
- [Changelog](https://github.com/prometheus-net/prometheus-net/blob/master/History)
- [Commits](https://github.com/prometheus-net/prometheus-net/compare/v3.5.0...v3.6.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-22 12:01:32 +00:00
Patrick Barron
743032f1e1
Merge pull request #3393 from Ullmie02/api-dashboard
Move DashboardController to Jellyfin.Api
2020-06-21 19:41:11 +00:00
crobibero
38788a1f1d Merge remote-tracking branch 'upstream/api-migration' into api-library 2020-06-21 11:34:05 -06:00
David
64fb173dad Move DashboardController to Jellyfin.Api 2020-06-20 15:59:41 +02:00
crobibero
e2a7e8d97e Move LibraryService.cs to Jellyfin.Api 2020-06-19 13:10:10 -06:00
David
08401f923d Change swagger dictionary type mapping 2020-06-19 15:49:44 +02:00
David
6651cb8d24 Add JsonInto32Converter
Add additional swagger type mapping
2020-06-19 12:24:39 +02:00
crobibero
0c01b6817b Add X-Forward-(For/Proto) support 2020-06-17 08:05:30 -06:00
dkanada
e77f6194f2
add missing comma in array 2020-06-17 02:16:17 +09:00
dkanada
f5d82441a4
Merge branch 'master' into custom-repos 2020-06-17 02:09:32 +09:00
crobibero
4aac936721 Add more authorization handlers, actually authorize requests 2020-06-15 12:49:54 -06:00
Bond_009
b30ae1a949 Remove code for handling single hyphen arguments
and return exit code 1 when argument parsing fails
2020-06-15 17:06:57 +02:00
Bond-009
0426f3d93d
Merge pull request #3349 from jellyfin/dependabot/nuget/Serilog.Sinks.Graylog-2.1.3
Bump Serilog.Sinks.Graylog from 2.1.2 to 2.1.3
2020-06-15 16:16:43 +02:00
dependabot[bot]
685458b40d
Bump Serilog.Sinks.Graylog from 2.1.2 to 2.1.3
Bumps [Serilog.Sinks.Graylog](https://github.com/whir1/serilog-sinks-graylog) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/whir1/serilog-sinks-graylog/releases)
- [Commits](https://github.com/whir1/serilog-sinks-graylog/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-15 12:01:35 +00:00
dependabot[bot]
b0093fbce4
Bump CommandLineParser from 2.7.82 to 2.8.0
Bumps [CommandLineParser](https://github.com/commandlineparser/commandline) from 2.7.82 to 2.8.0.
- [Release notes](https://github.com/commandlineparser/commandline/releases)
- [Changelog](https://github.com/commandlineparser/commandline/blob/master/CHANGELOG.md)
- [Commits](https://github.com/commandlineparser/commandline/commits/2.8.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-15 12:01:32 +00:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
Patrick Barron
42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
crobibero
ec3e15db57 Fix merge and build 2020-06-13 13:11:41 -06:00
crobibero
829eb1a849 merge master into api-migration 2020-06-13 13:03:09 -06:00
crobibero
6d5c09c499 Remove duplicate swaggerdoc 2020-06-12 14:40:06 -06:00
crobibero
720fff30a4 readd swagger version 2020-06-12 14:37:55 -06:00
crobibero
2fe65d99f6 Merge remote-tracking branch 'upstream/api-migration' into api-swagger-auth 2020-06-12 14:35:51 -06:00
dkanada
403cd3205f
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
2020-06-13 00:29:43 +09:00
dkanada
72a688aa7a
Merge pull request #3298 from jellyfin/dependabot/nuget/SQLitePCLRaw.bundle_e_sqlite3-2.0.3
Bump SQLitePCLRaw.bundle_e_sqlite3 from 2.0.2 to 2.0.3
2020-06-12 13:34:57 +09:00
Patrick Barron
7a115024aa Merge branch 'master' into userdb-efcore
# Conflicts:
#	MediaBrowser.Controller/Library/ILibraryManager.cs
#	MediaBrowser.Providers/Users/UserMetadataService.cs
2020-06-11 18:23:12 -04:00
Cody Robibero
17ffb689e0
Merge branch 'master' into update-dotnet-core 2020-06-11 07:16:45 -06:00
crobibero
a6815018dc Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00
dependabot[bot]
ef9a8c5414
Bump SQLitePCLRaw.bundle_e_sqlite3 from 2.0.2 to 2.0.3
Bumps [SQLitePCLRaw.bundle_e_sqlite3](https://github.com/ericsink/SQLitePCL.raw) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/ericsink/SQLitePCL.raw/releases)
- [Commits](https://github.com/ericsink/SQLitePCL.raw/commits/v2.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-11 10:30:15 +00:00
dkanada
5cdf951643
Merge pull request #3222 from barronpm/activitylog-migration-fix
Fix Activity Log Migrations for Very Old Databases
2020-06-11 19:27:42 +09:00
dkanada
b3f8928fbb
Merge pull request #3218 from crobibero/api-cors
Enable CORS and Authentation
2020-06-09 14:29:52 +09:00
crobibero
6be862545a Merge remote-tracking branch 'upstream/api-migration' into api-cors 2020-06-06 17:07:29 -06:00
crobibero
48cbac934b Don't clear media types 2020-06-06 16:53:49 -06:00
crobibero
04abb281c0 Add CSS output formatter. 2020-06-06 16:52:23 -06:00
crobibero
598cd94c4d Add CSS output formatter. 2020-06-06 16:51:21 -06:00
dkanada
8ac2f1bb8b simplify the custom repository feature for now 2020-06-06 22:02:30 +09:00
dkanada
d6184dbadd remove unnecessary property for repository object 2020-06-06 18:57:00 +09:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
crobibero
340624c54b Move default repo addition to migration 2020-06-05 13:23:38 -06:00
Patrick Barron
06f9cde22f Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
2020-06-04 16:52:23 -04:00
Patrick Barron
ef7bbb3b84 Use data binding instead of raw SQL 2020-06-04 14:54:43 -04:00
dkanada
b7f4b8e2b5 initial implementation for custom plugin repositories 2020-06-04 23:57:57 +09:00
dkanada
35366772b2
Merge pull request #3186 from Ullmie02/asp-api-exception
Don't send Exception message in Production Environment
2020-06-04 14:49:36 +09:00
crobibero
01a5103fef Add Dictionary with non-string keys to System.Text.Json 2020-06-02 11:47:33 -06:00
crobibero
4fe0beec16 Fix Json Enum conversion, map all JsonDefaults properties to API 2020-06-02 08:23:12 -06:00
David
6d9f564a94
Remove duplicate code
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-06-02 15:04:55 +02:00