Commit graph

520 commits

Author SHA1 Message Date
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
Patrick Barron b0281b79fd Fix a bug where very old Emby databases didn't use proper Guid's 2020-06-01 20:12:34 -04:00
crobibero dfe873fc29 Add Authentication to openapi generation. 2020-06-01 11:12:33 -06:00
crobibero b944b8f8c5 Enable CORS and Authentication. 2020-06-01 11:03:08 -06:00
Patrick Barron 585fdbad39 Apply review suggestion and fix entity concurrency tokens. 2020-05-31 17:00:57 -04:00
Bond_009 4748105dce Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode 2020-05-29 11:28:19 +02:00
Patrick Barron 8ca78f33e9 Fix bug when migrating user db with users that have never logged in. 2020-05-28 14:21:26 -04:00
Patrick Barron fefb282137 Fixed issue when LastLoginDate or LastActivityDate were null 2020-05-26 22:30:23 -04:00
Patrick Barron 46a0a2a601 Update migrations and fix a few bugs 2020-05-26 21:20:55 -04:00
Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
2020-05-26 20:29:11 -04:00
Anthony Lavado 9c00226f11
Merge pull request #3033 from neilsb/autodiscover-url-override
Allow override of address published by auto discovery
2020-05-26 12:20:42 -04:00
David a5a39300bc Don't send Exception message in Production Environment 2020-05-26 16:55:27 +02:00
Patrick Barron e052128c52 Cleanup and fix more bugs 2020-05-23 16:07:42 -04:00
Patrick Barron e8173df9dc Cleanup 2020-05-23 15:33:14 -04:00
Patrick Barron 7d9d54d2ec Fix profile images. 2020-05-20 12:09:52 -04:00
Patrick Barron 1d1a145ad4 Fix issues and add profile image support 2020-05-20 10:04:00 -04:00
Patrick Barron d35a7ba8bd Fix more issues 2020-05-20 10:04:00 -04:00
Patrick Barron e7b297c67b Add some missing properties 2020-05-20 10:04:00 -04:00
Patrick Barron 3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Neil Burrows d7b2c2a176 Renaming variable and refactoring IF statement 2020-05-20 09:11:26 +01:00
Mark Monteiro 3ed76d7e08 Update to .NET Core 3.1.4 2020-05-17 13:33:38 -04:00
Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15 17:20:07 -04:00
Mark Monteiro 757643e326 Merge remote-tracking branch 'upstream/master' into no-more-doppelgangers 2020-05-15 15:23:44 -04:00
Mark Monteiro 6e68702799 Do not run DELETE command if no extras are detected
Also log a message if no extras were detected 
Also log the path used for the database backup
Also add some comments to explain the migration
2020-05-15 15:12:26 -04:00
Vasily 43dc604e87 Fixed compilation, added backing db before removing extras 2020-05-15 21:49:45 +03:00
Patrick Barron 79dee27299 Fixed indentation 2020-05-15 14:33:36 -04:00
Vasily 034fe97eeb
Apply suggestions from code review
Co-authored-by: Mark Monteiro <marknr.monteiro@protonmail.com>
2020-05-15 21:32:56 +03:00
Patrick Barron a7c2e524a9 Apply more review suggestions 2020-05-15 14:09:15 -04:00
Patrick Barron a5dee36808 Apply more review suggestions 2020-05-15 12:51:18 -04:00
Vasily 7c57134535 Implement a cleanup migration 2020-05-15 02:30:28 +03:00
Patrick Barron 87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Patrick Barron b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
Mark Monteiro 2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron 9925742918 Implement more review suggestions 2020-05-13 17:55:31 -04:00
Patrick Barron a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Patrick Barron 511d20a100 Apply review suggestions 2020-05-13 15:03:35 -04:00
Vasily f08830ea00
Merge pull request #2774 from mark-monteiro/simplify-https-config
Simplify HTTPS Properties
2020-05-13 20:36:54 +03:00
Patrick Barron b7621d762c 2nd half of changes 2020-05-13 00:00:57 -04:00
Patrick Barron c1360a1dc3 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln
2020-05-12 22:22:20 -04:00
Patrick Barron 9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Patrick Barron bac4bf96a0 Fix build errors 2020-05-12 12:50:17 -04:00
Patrick Barron 6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00:00
Bond-009 dabd67d127
Merge pull request #2900 from mark-monteiro/migration-dependency-injection
Use dependency injection to construct migration routines
2020-05-11 10:15:35 +02:00
Mark Monteiro a10aec6956 Fix merge 2020-05-10 18:17:12 -04:00
Mark Monteiro dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
crobibero 2b1b9a64b6 Add OperationId to SwaggerGen 2020-05-08 08:40:37 -06:00
dkanada 176159d0a8
Merge pull request #2969 from BaronGreenback/my-feature
http in development mode crashed -
2020-05-07 02:24:42 +09:00
BaronGreenback ba2134de13 Made changes to message and exception class 2020-05-06 16:04:07 +01:00
Mark Monteiro 1c06111497 Merge remote-tracking branch 'upstream/master' into integration-tests 2020-05-03 01:04:19 -04:00
Patrick Barron 032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Neil Burrows b737301c70 Auto discover published URL override 2020-05-02 17:56:09 +01:00
Bond_009 15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
crobibero 806ae1bc07 Remove versioned API 2020-04-29 08:04:05 -06:00
Cody Robibero d491b1b45f
Merge branch 'api-migration' into redoc 2020-04-29 07:38:18 -06:00
dkanada 2cb0f6f126
Merge pull request #2952 from crobibero/api-exception-middleware
Add Exception Middleware
2020-04-29 22:36:41 +09:00
Bond-009 690fb65cd8
Merge pull request #2985 from sparky8251/prometheus
Add Prometheus exporters
2020-04-29 11:36:05 +02:00
sparky8251 e3a42a8fe9 Address reviews 2020-04-27 08:42:46 -04:00
crobibero 068368df63 Order actions by route, then http method 2020-04-26 23:28:32 -06:00
Mark Monteiro 679f97d5e9 Merge remote-tracking branch 'upstream/master' into simplify-https-config
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
2020-04-26 17:37:30 -04:00
Joshua M. Boniface f502c89331
Merge pull request #2798 from JustAMan/fix-livetv-again
Make localhost LiveTV restreams always use plain HTTP port
2020-04-26 15:13:27 -04:00
BaronGreenback a0a5512069 2969 - re-issed code to address when developer doesn't have certificate installed. 2020-04-26 19:35:36 +01:00
Mark Monteiro 57b5ec1d51 Remove unnecessary properties from SystemInfo response object
These properties do not provide any useful information to the client. The client would already have to have all this information in order to connect to the endpoint to retrieve it
2020-04-26 12:07:54 -04:00
sparky8251 997b71bbef Metrics endpoint now respects baseurl 2020-04-26 11:52:01 -04:00
Mark Monteiro 93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
sparky8251 68c7a914c3 Added option to disable metrics collection and defaulted it to off 2020-04-26 11:28:17 -04:00
sparky8251 233337256f Add prometheus exporters 2020-04-25 21:36:03 -04:00
crobibero 890e659cd3 Fix autolaunch & redirect of swagger. 2020-04-25 15:12:18 -06:00
crobibero 0765ef8bda Apply suggestions, fix warning 2020-04-23 21:41:10 -06:00
crobibero b8508a57d8 oop 2020-04-23 21:38:40 -06:00
crobibero be50fae38a Address comments 2020-04-23 21:24:40 -06:00
crobibero 3c34d95608 Address comments 2020-04-23 21:23:29 -06:00
Mark Monteiro cd98938190 Merge remote-tracking branch 'upstream/master' into integration-tests 2020-04-23 19:32:40 -04:00
Admin d1684b1053 http in development mode crashed - 2020-04-23 18:30:48 +01:00
crobibero c6eebca335 Apply suggestions and add URL to log message 2020-04-23 07:29:28 -06:00
Bond-009 d744d7d234 Merge branch 'master' into register-services-correctly 2020-04-22 13:05:03 -04:00
crobibero 041d674eb6 Fix swagger ui Document Title 2020-04-21 16:19:26 -06:00
Bond-009 c0b3c11b2e
Merge pull request #2846 from jellyfin/azure
Remove requirement to build web during server builds
2020-04-22 00:17:44 +02:00
crobibero 2542a27bd5 Fix documentation endpoint for use with baseUrl 2020-04-21 16:15:31 -06:00
Mark Monteiro c5f163293f Add <ProjectGuid> properties to all project files
This is required for SonarCloud analysis to run
2020-04-21 16:21:09 -04:00
crobibero 3ef8448a51 Return to previous exception handle implementation 2020-04-21 09:09:05 -06:00
crobibero fe632146dc Move Json Options to static class for easier access. 2020-04-21 08:17:13 -06:00
crobibero 1175ce3f97 Add Exception Middleware 2020-04-21 07:36:22 -06:00
Mark Monteiro f815059698 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-20 20:11:33 -04:00
Mark Monteiro 51b610b999 Expose some methods in Program.cs so they can be used to initialize the application for integration tests 2020-04-20 14:58:00 -04:00
crobibero fff2a40ffc Remove StringEnumConverter 2020-04-20 07:24:13 -06:00
crobibero c89dc8921f Fix PascalCase 2020-04-19 18:10:59 -06:00
crobibero ad67081840 add camelCase formatter 2020-04-19 18:04:36 -06:00
crobibero 72745f4722 fix formatting 2020-04-19 11:28:56 -06:00
crobibero 5da88fac4d Enable string enum converter 2020-04-19 11:24:32 -06:00
crobibero e72a543570 Add Redoc, move docs to api-docs/ 2020-04-19 11:24:03 -06:00
crobibero 8a7e4cd639 add redoc 2020-04-19 10:51:51 -06:00
Mark Monteiro ecf49caf0d Add back warning message when Skia encoder cannot be used 2020-04-17 10:25:49 -04:00
Mark Monteiro 1666f3ca14 Use dependency injection to construct migration routines 2020-04-16 23:40:32 -04:00
ZadenRB bb288e16cc Document JSON options change 2020-04-15 17:02:43 -06:00
ZadenRB 72862d7b46 Lowercase actual parameters in code and remove whitespace to comply with StyleCopAnalyzers 2020-04-15 00:24:15 -06:00
ZadenRB 5a658cf260 Fix casing of JSON in Jellyfin API. Currently only affects startup wizard. 2020-04-12 19:17:46 -06:00
Mark Monteiro 1e1295bebf Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-11 10:00:39 -04:00
Vasily 53db9567d3
Merge pull request #2769 from mark-monteiro/configurable-repo-url
Make Plugin Repo URL Configurable
2020-04-10 12:52:46 +03:00
Vasily 626d4dab10 Make sure Jellyfin listens on localhost no matter what
This is needed by LiveTV
2020-04-08 13:45:53 +03:00
dkanada cb634d27d8
Merge branch 'master' into use-development-exception-page 2020-04-06 18:59:45 +09:00
Mark Monteiro 5bc6c08a0a Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-06 00:24:11 -04:00
Mark Monteiro 15dd46c25a Add '--plugin-manifest-url' command line option and 'InstallationManager:PluginManifestUrl' config option 2020-04-05 13:46:36 -04:00
Mark Monteiro f91f2ef328 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-05 10:07:17 -04:00
Mark Monteiro f2760cb055 Register IImageEncoder in Jellyfin.Server instead of Emby.Server.Implementations 2020-04-05 10:03:53 -04:00
Bond-009 29539174a3
Merge pull request #2636 from mark-monteiro/development-https
Use ASP.NET Core HTTPS Development Certificate
2020-04-05 15:09:27 +02:00
Mark Monteiro 735d6c8ad5 Convert properties in ApplicationHost to private readonly fields, where possible 2020-04-04 23:18:47 -04:00
Mark Monteiro aee6a1b476 Remove unnecessary async and parameter from ApplicationHost initialization method 2020-04-04 20:40:50 -04:00
Mark Monteiro 5d648bf54f Register and construct ILocalizationManager correctly 2020-04-04 20:21:48 -04:00
Mark Monteiro 07cebbeae2 Register and construct IImageProcessor, SqliteItemRepository and IImageEncoder correctly 2020-04-04 17:12:24 -04:00
Mark Monteiro 0ce82ab332 Remove unnecessary fields in ApplicationHost 2020-04-04 15:05:50 -04:00
Mark Monteiro ca71ac72ab Replace EnableHttps and SupportsHttps with ListenWithHttps and CanConnectWithHttps 2020-04-02 17:45:04 -04:00
Mark Monteiro eadad73117 Merge branch 'master' into use-development-exception-page 2020-04-02 13:51:53 -04:00
Vasily 89448ac055
Merge pull request #2634 from mark-monteiro/enable-http2
Enable HTTP/2 support
2020-04-02 13:54:05 +03:00
Mark Monteiro 0e57348cf4 Merge remote-tracking branch 'upstream/master' into development-https 2020-04-01 23:21:30 +02:00
Mark Monteiro 123bfbcf19 Merge remote-tracking branch 'upstream/master' into use-development-exception-page 2020-04-01 23:09:55 +02:00
Bond-009 f31efce52d
Merge branch 'master' into usings 2020-04-01 22:42:43 +02:00
Vasily 07ea120ba9
Merge pull request #2601 from mark-monteiro/support-running-without-web-content
Support Running Server Without Web Content
2020-04-01 23:38:43 +03:00
Bond-009 ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Mark Monteiro aa9737afb3 Update .NET Core to 3.1.3 2020-03-25 20:09:48 +01:00