Commit Graph

  • 979137f567 Bump coverlet.collector from 1.2.1 to 1.3.0 dependabot[bot] 2020-06-15 12:01:24 +00:00
  • c243ec7ce9 Bump PlaylistsNET from 1.0.4 to 1.0.6 dependabot[bot] 2020-06-15 12:01:17 +00:00
  • dabb869a6b Merge branch 'master' into hwaccel dkanada 2020-06-15 20:21:25 +09:00
  • 3fbc387257 Fix stylecop error like on master. Max Git 2020-06-15 12:15:05 +02:00
  • 37e737e012 Merge from master & fix conflict Max Git 2020-06-15 12:12:03 +02:00
  • 6d6793151a Null pointer check added for subscription as 2nd param is false. BaronGreenback 2020-06-15 10:10:52 +01:00
  • 862bcdba67 Merge pull request #23 from jellyfin/master BaronGreenback 2020-06-15 10:01:55 +01:00
  • 100e9d586d Merge pull request #3336 from telans/specific-fixes Anthony Lavado 2020-06-14 22:51:29 -04:00
  • cf9223b8cb Merge pull request #3340 from crobibero/api-migration-merge Anthony Lavado 2020-06-14 22:50:49 -04:00
  • 524243a934 fix merge conflict crobibero 2020-06-14 20:18:06 -06:00
  • 589735f60c Merge remote-tracking branch 'upstream/master' into HEAD crobibero 2020-06-14 20:15:26 -06:00
  • f026a1d721 Merge pull request #3267 from pusta/Contributors-Update dkanada 2020-06-15 10:57:13 +09:00
  • 6db1878011 Merge pull request #3315 from crobibero/dashboard-update dkanada 2020-06-15 10:55:33 +09:00
  • e2b2f74b47 Merge pull request #3319 from Ullmie02/api-204 dkanada 2020-06-15 10:51:28 +09:00
  • 155ee5ee9d Merge pull request #3329 from telans/code-analyzer-tests dkanada 2020-06-15 10:50:08 +09:00
  • 4f2ae5c9e1 Merge pull request #3158 from Artiume/patch-5 dkanada 2020-06-15 10:46:54 +09:00
  • 293187480f Merge pull request #3288 from Ullmie02/api-subtitles Patrick Barron 2020-06-14 19:06:01 -04:00
  • 8620dfc18b remove symlink telans 2020-06-14 22:53:21 +12:00
  • afc9224ede fix SA1111 telans 2020-06-14 22:20:19 +12:00
  • 9b528aabc2 misc telans 2020-06-14 22:14:14 +12:00
  • 3d9049ef08 fix SA1508 telans 2020-06-14 21:35:49 +12:00
  • acd4389653 fix SA1005 telans 2020-06-14 21:11:11 +12:00
  • 726e116d5b fix SA1510 telans 2020-06-14 20:49:24 +12:00
  • 15aea76523 Merge pull request #3148 from barronpm/userdb-efcore Anthony Lavado 2020-06-14 18:31:27 -04:00
  • edc5611ec7 Fix null reference to fix CI David 2020-06-14 13:50:51 +02:00
  • 8a8bf4b686 Merge remote-tracking branch 'upstream/api-migration' into api-sessionservice David 2020-06-14 12:49:43 +02:00
  • ac0a3180d7 Merge remote-tracking branch 'upstream/api-migration' into api-librarystructure David 2020-06-14 12:49:19 +02:00
  • 9bedd9ac3c Merge remote-tracking branch 'upstream/api-migration' into api-204 David 2020-06-14 12:48:17 +02:00
  • d01f56bc42 Merge remote-tracking branch 'upstream/api-migration' into api-subtitles David 2020-06-14 12:45:49 +02:00
  • cf3d0f8d51 Merge remote-tracking branch 'remotes/upstream/api-migration' into api-system David 2020-06-14 12:43:10 +02:00
  • 4cb8fbfbbf fix StyleCop warning in Jellyfin.MediaEncoding.Tests telans 2020-06-14 18:56:47 +12:00
  • 7b54a43cc1 Fix docs typo crobibero 2020-06-13 20:15:19 -06:00
  • 14f32b4927 Remove warnings from MediaBrowser.LocalMetadata crobibero 2020-06-13 20:04:53 -06:00
  • 42b4f0aa2e Merge branch 'master' into userdb-efcore Patrick Barron 2020-06-13 19:41:05 -04:00
  • e8f8307521 Add comment Patrick Barron 2020-06-13 19:30:45 -04:00
  • 6f325fea61 Add missing properties to UserDto Patrick Barron 2020-06-13 18:26:46 -04:00
  • 8405ae9b1f Actually set BlockUnratedItems Patrick Barron 2020-06-13 18:23:13 -04:00
  • aa4ac5902e Fix concurrency exception Patrick Barron 2020-06-13 18:08:17 -04:00
  • 276750f310 Move ItemRefreshService.cs to Jellyfin.Api crobibero 2020-06-13 15:33:42 -06:00
  • 13b53db4ef fix build crobibero 2020-06-13 15:31:22 -06:00
  • 2d4998c578 fix build crobibero 2020-06-13 15:28:04 -06:00
  • ae514da840 Merge remote-tracking branch 'upstream/api-migration' into api-environment crobibero 2020-06-13 15:27:03 -06:00
  • 8a834fb728 Merge remote-tracking branch 'upstream/api-migration' into api-filter crobibero 2020-06-13 15:25:02 -06:00
  • 81030a0a5a Merge remote-tracking branch 'upstream/api-migration' into api-plugin crobibero 2020-06-13 15:24:34 -06:00
  • ce37c40749 Merge remote-tracking branch 'upstream/api-migration' into api-item-lookup crobibero 2020-06-13 15:23:42 -06:00
  • 50f6d8029d Merge remote-tracking branch 'upstream/api-migration' into api-item-update crobibero 2020-06-13 15:21:50 -06:00
  • 9ee6ea86ea Merge remote-tracking branch 'upstream/api-migration' into api-localization crobibero 2020-06-13 15:21:13 -06:00
  • bcce8190ff Merge remote-tracking branch 'upstream/api-migration' into api-channel crobibero 2020-06-13 15:20:13 -06:00
  • 3c18745f53 Remove RemoteImageService.cs crobibero 2020-06-13 15:15:27 -06:00
  • 552a74eb6e Fix build crobibero 2020-06-13 15:13:57 -06:00
  • 6c7cc92a09 Merge remote-tracking branch 'upstream/api-migration' into api-image2 crobibero 2020-06-13 15:09:02 -06:00
  • bd09753976 Merge remote-tracking branch 'upstream/api-migration' into api-image crobibero 2020-06-13 15:07:04 -06:00
  • 39376bace3 Merge remote-tracking branch 'upstream/api-migration' into api-scheduled-tasks crobibero 2020-06-13 15:06:07 -06:00
  • 7666a1201f Merge remote-tracking branch 'upstream/api-migration' into api-display-preferences crobibero 2020-06-13 15:03:43 -06:00
  • 3278015444 Actually fix profile images Patrick Barron 2020-06-13 16:38:17 -04:00
  • 0011e8df47 Merge pull request #3332 from crobibero/api-migration Joshua M. Boniface 2020-06-13 16:28:37 -04:00
  • b8d80bf09c Update CONTRIBUTORS.md Chris Kapusta 2020-06-13 14:32:42 -05:00
  • ec3e15db57 Fix merge and build crobibero 2020-06-13 13:11:41 -06:00
  • 829eb1a849 merge master into api-migration crobibero 2020-06-13 13:03:09 -06:00
  • 4d50941d44 Merge pull request #22 from jellyfin/master BaronGreenback 2020-06-13 17:56:10 +01:00
  • 1e1386bbc6 Fix build issues Patrick Barron 2020-06-13 11:59:19 -04:00
  • 84f0cf6cc6 Regenerate migrations Patrick Barron 2020-06-13 11:56:18 -04:00
  • 103c9b7162 Actually fix deleting profile images (hopefully) Patrick Barron 2020-06-12 22:47:09 -04:00
  • bf5b21e67b enable code analyzers for tests telans 2020-06-13 23:37:41 +12:00
  • d975ad155e Merge pull request #3220 from crobibero/api-swagger-auth dkanada 2020-06-13 13:48:33 +09:00
  • 6d5c09c499 Remove duplicate swaggerdoc crobibero 2020-06-12 14:40:06 -06:00
  • 720fff30a4 readd swagger version crobibero 2020-06-12 14:37:55 -06:00
  • 2fe65d99f6 Merge remote-tracking branch 'upstream/api-migration' into api-swagger-auth crobibero 2020-06-12 14:35:51 -06:00
  • fff3c789b9 Move SessionService to Jellyfin.Api David 2020-06-12 18:54:25 +02:00
  • 403cd3205f Merge pull request #3254 from crobibero/ilogger dkanada 2020-06-13 00:29:43 +09:00
  • 618b893c48 Move LibraryStructureService to Jellyfin.Api David 2020-06-12 15:39:06 +02:00
  • 5b6e8fb22c Remove whitespace crobibero 2020-06-12 06:53:47 -06:00
  • 043d76bd6e Use Http status code 204 instead of 200 David 2020-06-12 12:38:13 +02:00
  • 91fcd56380 Merge pull request #3071 from rigtorp/tvdb-normalize dkanada 2020-06-12 13:38:09 +09:00
  • 72a688aa7a Merge pull request #3298 from jellyfin/dependabot/nuget/SQLitePCLRaw.bundle_e_sqlite3-2.0.3 dkanada 2020-06-12 13:34:57 +09:00
  • 6033058f51 Merge pull request #3313 from crobibero/update-dotnet-core dkanada 2020-06-12 13:34:42 +09:00
  • 6429e60c40 Merge pull request #2931 from crobibero/api-attachment Patrick Barron 2020-06-11 23:56:16 -04:00
  • 5d3ff25e26 Merge pull request #3291 from cvium/fix_authenticationexception Anthony Lavado 2020-06-11 23:14:33 -04:00
  • 6a62c3c628 Merge pull request #3281 from Ullmie02/api-activitylog Patrick Barron 2020-06-11 23:00:41 -04:00
  • a6573e015f Merge pull request #2983 from bruceCoelho/api-migration Patrick Barron 2020-06-11 22:52:35 -04:00
  • 82e8865147 Make tvdb name normalizer unicode aware Erik Rigtorp 2020-05-07 18:45:04 -07:00
  • d0e2027b05 (Hopefully) fix concurrency exceptions. Patrick Barron 2020-06-11 19:45:31 -04:00
  • fc02157b42 Fix build errors Patrick Barron 2020-06-11 18:28:49 -04:00
  • 7a115024aa Merge branch 'master' into userdb-efcore Patrick Barron 2020-06-11 18:23:12 -04:00
  • 4c0dd10fb3 Update MediaBrowser.Common/Json/Converters/JsonNonStringKeyDictionaryConverter.cs Cody Robibero 2020-06-11 16:21:53 -06:00
  • 306f7b3c30 Update INetworkManager.cs BaronGreenback 2020-06-11 23:10:13 +01:00
  • 2cecde658b Update INetworkManager.cs BaronGreenback 2020-06-11 22:58:29 +01:00
  • 7fba0b778e Properly remove profile images Patrick Barron 2020-06-11 17:51:02 -04:00
  • 4d9171f691 Update DlnaEntryPoint.cs BaronGreenback 2020-06-11 22:40:43 +01:00
  • c722ad22ec Handle the case when the stored password is null, but the user tried to login with a password. aled 2020-06-11 14:24:50 +01:00
  • 0f69ca8fa9 Merge branch 'master' into feature/ffmpeg-version-check Max Git 2020-06-11 20:47:12 +02:00
  • 762e0c8d17 Merge pull request #3289 from rigtorp/tmdb-comment-fix Bond-009 2020-06-11 19:12:30 +02:00
  • 30609c848b Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter crobibero 2020-06-11 10:51:47 -06:00
  • 157d8f6145 Merge pull request #3309 from jellyfin/dependabot/nuget/ServiceStack.Text.Core-5.9.0 dkanada 2020-06-11 23:30:22 +09:00
  • ce9e7d47b7 Merge pull request #3293 from jellyfin/dependabot/nuget/System.Text.Encoding.CodePages-4.7.1 dkanada 2020-06-11 23:29:46 +09:00
  • ea7e8ced57 Merge pull request #3292 from jellyfin/dependabot/nuget/SkiaSharp.NativeAssets.Linux-1.68.3 dkanada 2020-06-11 23:29:27 +09:00
  • a47ff4043f Disable CA1801 David 2020-06-11 16:01:41 +02:00
  • fcbae95d19 Use 'await using Stream' instead of 'using Stream' David 2020-06-11 15:57:31 +02:00
  • 17ffb689e0 Merge branch 'master' into update-dotnet-core Cody Robibero 2020-06-11 07:16:45 -06:00
  • a6815018dc Update to .NET Core 3.1.5 crobibero 2020-06-11 07:13:56 -06:00