Commit Graph

16465 Commits

Author SHA1 Message Date
crobibero
4aac936721 Add more authorization handlers, actually authorize requests 2020-06-15 12:49:54 -06:00
Anthony Lavado
cf9223b8cb
Merge pull request #3340 from crobibero/api-migration-merge
Merge master into api-migration
2020-06-14 22:50:49 -04:00
crobibero
524243a934 fix merge conflict 2020-06-14 20:18:06 -06:00
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06:00
dkanada
f026a1d721
Merge pull request #3267 from pusta/Contributors-Update
CONTRIBUTORS.md - Updated jellyfin-server-windows to compile against .Net Core 3.1
2020-06-15 10:57:13 +09:00
dkanada
6db1878011
Merge pull request #3315 from crobibero/dashboard-update
Add MessageId to websocket message, fix ws exception
2020-06-15 10:55:33 +09:00
dkanada
e2b2f74b47
Merge pull request #3319 from Ullmie02/api-204
Use Http status code 204 instead of 200
2020-06-15 10:51:28 +09:00
dkanada
155ee5ee9d
Merge pull request #3329 from telans/code-analyzer-tests
Enable code analyzers for tests
2020-06-15 10:50:08 +09:00
dkanada
4f2ae5c9e1
Merge pull request #3158 from Artiume/patch-5
Update Library Service
2020-06-15 10:46:54 +09:00
Patrick Barron
293187480f
Merge pull request #3288 from Ullmie02/api-subtitles
Move SubtitleService to Jellyfin.Api
2020-06-14 19:06:01 -04:00
Anthony Lavado
15aea76523
Merge pull request #3148 from barronpm/userdb-efcore
Migrate User DB to EF Core
2020-06-14 18:31:27 -04:00
David
9bedd9ac3c Merge remote-tracking branch 'upstream/api-migration' into api-204 2020-06-14 12:48:17 +02:00
David
d01f56bc42 Merge remote-tracking branch 'upstream/api-migration' into api-subtitles 2020-06-14 12:45:49 +02:00
telans
4cb8fbfbbf
fix StyleCop warning in Jellyfin.MediaEncoding.Tests 2020-06-14 18:56:47 +12: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
Patrick Barron
e8f8307521 Add comment 2020-06-13 19:30:45 -04:00
Patrick Barron
6f325fea61 Add missing properties to UserDto 2020-06-13 18:26:46 -04:00
Patrick Barron
8405ae9b1f Actually set BlockUnratedItems 2020-06-13 18:23:13 -04:00
Patrick Barron
aa4ac5902e Fix concurrency exception 2020-06-13 18:08:17 -04:00
Patrick Barron
3278015444 Actually fix profile images 2020-06-13 16:38:17 -04:00
Joshua M. Boniface
0011e8df47
Merge pull request #3332 from crobibero/api-migration
Merge master into api-migration
2020-06-13 16:28:37 -04:00
Chris Kapusta
b8d80bf09c
Update CONTRIBUTORS.md
Co-authored-by: Bond-009 <bond.009@outlook.com>
2020-06-13 14:32:42 -05: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
Patrick Barron
1e1386bbc6 Fix build issues 2020-06-13 11:59:19 -04:00
Patrick Barron
84f0cf6cc6 Regenerate migrations 2020-06-13 11:56:18 -04:00
Patrick Barron
103c9b7162 Actually fix deleting profile images (hopefully) 2020-06-13 08:28:42 -04:00
telans
bf5b21e67b
enable code analyzers for tests 2020-06-13 23:37:41 +12:00
dkanada
d975ad155e
Merge pull request #3220 from crobibero/api-swagger-auth
Add Authentication to openapi generation.
2020-06-13 13:48:33 +09: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
crobibero
5b6e8fb22c Remove whitespace 2020-06-12 06:53:47 -06:00
David
043d76bd6e Use Http status code 204 instead of 200 2020-06-12 12:38:13 +02:00
dkanada
91fcd56380
Merge pull request #3071 from rigtorp/tvdb-normalize
Make tvdb name normalizer unicode aware
2020-06-12 13:38:09 +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
dkanada
6033058f51
Merge pull request #3313 from crobibero/update-dotnet-core
Update to .NET Core 3.1.5
2020-06-12 13:34:42 +09:00
Patrick Barron
6429e60c40
Merge pull request #2931 from crobibero/api-attachment
AttachmentsService to Jellyfin.Api
2020-06-11 23:56:16 -04:00
Anthony Lavado
5d3ff25e26
Merge pull request #3291 from cvium/fix_authenticationexception
Use the "legacy" AuthenticationException in AuthService
2020-06-11 23:14:33 -04:00
Patrick Barron
6a62c3c628
Merge pull request #3281 from Ullmie02/api-activitylog
Move ActivityLogService to Jellyfin.Api
2020-06-11 23:00:41 -04:00
Patrick Barron
a6573e015f
Merge pull request #2983 from bruceCoelho/api-migration
PackageService to Jellyfin.API
2020-06-11 22:52:35 -04:00
Erik Rigtorp
82e8865147 Make tvdb name normalizer unicode aware 2020-06-11 17:26:38 -07:00
Patrick Barron
d0e2027b05 (Hopefully) fix concurrency exceptions. 2020-06-11 19:45:31 -04:00
Patrick Barron
fc02157b42 Fix build errors 2020-06-11 18:28:49 -04: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
4c0dd10fb3
Update MediaBrowser.Common/Json/Converters/JsonNonStringKeyDictionaryConverter.cs
Co-authored-by: aled <aled@wibblr.com>
2020-06-11 16:21:53 -06:00
Patrick Barron
7fba0b778e Properly remove profile images 2020-06-11 17:51:02 -04:00
Bond-009
762e0c8d17
Merge pull request #3289 from rigtorp/tmdb-comment-fix
Clarify comment and log actual search string in TMDB search provider
2020-06-11 19:12:30 +02:00
crobibero
30609c848b Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter 2020-06-11 10:51:47 -06:00