Anthony Lavado
|
cf9223b8cb
|
Merge pull request #3340 from crobibero/api-migration-merge
Merge master into api-migration
|
4 years ago |
crobibero
|
524243a934
|
fix merge conflict
|
4 years ago |
|
crobibero
|
589735f60c
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
4 years ago |
dkanada
|
f026a1d721
|
Merge pull request #3267 from pusta/Contributors-Update
CONTRIBUTORS.md - Updated jellyfin-server-windows to compile against .Net Core 3.1
|
4 years ago |
|
dkanada
|
6db1878011
|
Merge pull request #3315 from crobibero/dashboard-update
Add MessageId to websocket message, fix ws exception
|
4 years ago |
|
dkanada
|
e2b2f74b47
|
Merge pull request #3319 from Ullmie02/api-204
Use Http status code 204 instead of 200
|
4 years ago |
|
dkanada
|
155ee5ee9d
|
Merge pull request #3329 from telans/code-analyzer-tests
Enable code analyzers for tests
|
4 years ago |
|
dkanada
|
4f2ae5c9e1
|
Merge pull request #3158 from Artiume/patch-5
Update Library Service
|
4 years ago |
Patrick Barron
|
293187480f
|
Merge pull request #3288 from Ullmie02/api-subtitles
Move SubtitleService to Jellyfin.Api
|
4 years ago |
|
Anthony Lavado
|
15aea76523
|
Merge pull request #3148 from barronpm/userdb-efcore
Migrate User DB to EF Core
|
4 years ago |
David
|
9bedd9ac3c
|
Merge remote-tracking branch 'upstream/api-migration' into api-204
|
4 years ago |
|
David
|
d01f56bc42
|
Merge remote-tracking branch 'upstream/api-migration' into api-subtitles
|
4 years ago |
telans
|
4cb8fbfbbf
|
fix StyleCop warning in Jellyfin.MediaEncoding.Tests
|
4 years ago |
Patrick Barron
|
42b4f0aa2e
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
|
4 years ago |
|
Patrick Barron
|
e8f8307521
|
Add comment
|
4 years ago |
|
Patrick Barron
|
6f325fea61
|
Add missing properties to UserDto
|
4 years ago |
|
Patrick Barron
|
8405ae9b1f
|
Actually set `BlockUnratedItems`
|
4 years ago |
|
Patrick Barron
|
aa4ac5902e
|
Fix concurrency exception
|
4 years ago |
|
Patrick Barron
|
3278015444
|
Actually fix profile images
|
4 years ago |
Joshua M. Boniface
|
0011e8df47
|
Merge pull request #3332 from crobibero/api-migration
Merge master into api-migration
|
4 years ago |
Chris Kapusta
|
b8d80bf09c
|
Update CONTRIBUTORS.md
Co-authored-by: Bond-009 <bond.009@outlook.com>
|
4 years ago |
|
crobibero
|
ec3e15db57
|
Fix merge and build
|
4 years ago |
|
crobibero
|
829eb1a849
|
merge master into api-migration
|
4 years ago |
|
Patrick Barron
|
1e1386bbc6
|
Fix build issues
|
4 years ago |
|
Patrick Barron
|
84f0cf6cc6
|
Regenerate migrations
|
4 years ago |
|
Patrick Barron
|
103c9b7162
|
Actually fix deleting profile images (hopefully)
|
4 years ago |
|
telans
|
bf5b21e67b
|
enable code analyzers for tests
|
4 years ago |
|
dkanada
|
d975ad155e
|
Merge pull request #3220 from crobibero/api-swagger-auth
Add Authentication to openapi generation.
|
4 years ago |
|
crobibero
|
6d5c09c499
|
Remove duplicate swaggerdoc
|
4 years ago |
|
crobibero
|
720fff30a4
|
readd swagger version
|
4 years ago |
|
crobibero
|
2fe65d99f6
|
Merge remote-tracking branch 'upstream/api-migration' into api-swagger-auth
|
4 years ago |
|
dkanada
|
403cd3205f
|
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
|
4 years ago |
|
crobibero
|
5b6e8fb22c
|
Remove whitespace
|
4 years ago |
|
David
|
043d76bd6e
|
Use Http status code 204 instead of 200
|
4 years ago |
|
dkanada
|
91fcd56380
|
Merge pull request #3071 from rigtorp/tvdb-normalize
Make tvdb name normalizer unicode aware
|
4 years ago |
|
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
|
4 years ago |
|
dkanada
|
6033058f51
|
Merge pull request #3313 from crobibero/update-dotnet-core
Update to .NET Core 3.1.5
|
4 years ago |
|
Patrick Barron
|
6429e60c40
|
Merge pull request #2931 from crobibero/api-attachment
AttachmentsService to Jellyfin.Api
|
4 years ago |
|
Anthony Lavado
|
5d3ff25e26
|
Merge pull request #3291 from cvium/fix_authenticationexception
Use the "legacy" AuthenticationException in AuthService
|
4 years ago |
|
Patrick Barron
|
6a62c3c628
|
Merge pull request #3281 from Ullmie02/api-activitylog
Move ActivityLogService to Jellyfin.Api
|
4 years ago |
|
Patrick Barron
|
a6573e015f
|
Merge pull request #2983 from bruceCoelho/api-migration
PackageService to Jellyfin.API
|
4 years ago |
Erik Rigtorp
|
82e8865147
|
Make tvdb name normalizer unicode aware
|
4 years ago |
|
Patrick Barron
|
d0e2027b05
|
(Hopefully) fix concurrency exceptions.
|
4 years ago |
|
Patrick Barron
|
fc02157b42
|
Fix build errors
|
4 years ago |
|
Patrick Barron
|
7a115024aa
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
|
4 years ago |
|
Cody Robibero
|
4c0dd10fb3
|
Update MediaBrowser.Common/Json/Converters/JsonNonStringKeyDictionaryConverter.cs
Co-authored-by: aled <aled@wibblr.com>
|
4 years ago |
|
Patrick Barron
|
7fba0b778e
|
Properly remove profile images
|
4 years ago |
Bond-009
|
762e0c8d17
|
Merge pull request #3289 from rigtorp/tmdb-comment-fix
Clarify comment and log actual search string in TMDB search provider
|
4 years ago |
|
crobibero
|
30609c848b
|
Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter
|
4 years ago |
|
dkanada
|
157d8f6145
|
Merge pull request #3309 from jellyfin/dependabot/nuget/ServiceStack.Text.Core-5.9.0
Bump ServiceStack.Text.Core from 5.8.0 to 5.9.0
|
4 years ago |
