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 |
|
crobibero
|
276750f310
|
Move ItemRefreshService.cs to Jellyfin.Api
|
2020-06-13 15:33:42 -06:00 |
|
crobibero
|
13b53db4ef
|
fix build
|
2020-06-13 15:31:22 -06:00 |
|
crobibero
|
2d4998c578
|
fix build
|
2020-06-13 15:28:04 -06:00 |
|
crobibero
|
ae514da840
|
Merge remote-tracking branch 'upstream/api-migration' into api-environment
|
2020-06-13 15:27:03 -06:00 |
|
crobibero
|
8a834fb728
|
Merge remote-tracking branch 'upstream/api-migration' into api-filter
|
2020-06-13 15:25:02 -06:00 |
|
crobibero
|
81030a0a5a
|
Merge remote-tracking branch 'upstream/api-migration' into api-plugin
|
2020-06-13 15:24:34 -06:00 |
|
crobibero
|
ce37c40749
|
Merge remote-tracking branch 'upstream/api-migration' into api-item-lookup
|
2020-06-13 15:23:42 -06:00 |
|
crobibero
|
50f6d8029d
|
Merge remote-tracking branch 'upstream/api-migration' into api-item-update
|
2020-06-13 15:21:50 -06:00 |
|
crobibero
|
9ee6ea86ea
|
Merge remote-tracking branch 'upstream/api-migration' into api-localization
|
2020-06-13 15:21:13 -06:00 |
|
crobibero
|
bcce8190ff
|
Merge remote-tracking branch 'upstream/api-migration' into api-channel
|
2020-06-13 15:20:13 -06:00 |
|
crobibero
|
3c18745f53
|
Remove RemoteImageService.cs
|
2020-06-13 15:15:27 -06:00 |
|
crobibero
|
552a74eb6e
|
Fix build
|
2020-06-13 15:13:57 -06:00 |
|
crobibero
|
6c7cc92a09
|
Merge remote-tracking branch 'upstream/api-migration' into api-image2
|
2020-06-13 15:09:02 -06:00 |
|
crobibero
|
bd09753976
|
Merge remote-tracking branch 'upstream/api-migration' into api-image
|
2020-06-13 15:07:04 -06:00 |
|
crobibero
|
39376bace3
|
Merge remote-tracking branch 'upstream/api-migration' into api-scheduled-tasks
|
2020-06-13 15:06:07 -06:00 |
|
crobibero
|
7666a1201f
|
Merge remote-tracking branch 'upstream/api-migration' into api-display-preferences
|
2020-06-13 15:03:43 -06: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 |
|
David
|
fff3c789b9
|
Move SessionService to Jellyfin.Api
|
2020-06-12 18:54:25 +02:00 |
|
dkanada
|
403cd3205f
|
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
|
2020-06-13 00:29:43 +09:00 |
|
David
|
618b893c48
|
Move LibraryStructureService to Jellyfin.Api
|
2020-06-12 15:39:06 +02: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 |
|