Commit Graph

16483 Commits

Author SHA1 Message Date
dkanada
dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09:00
BaronGreenback
6d6793151a Null pointer check added for subscription as 2nd param is false. 2020-06-15 10:10:52 +01:00
BaronGreenback
862bcdba67
Merge pull request #23 from jellyfin/master
updating
2020-06-15 10:01:55 +01:00
Anthony Lavado
100e9d586d
Merge pull request #3336 from telans/specific-fixes
Fix trivial SA1005, SA1111, SA1508, SA1510 warnings
2020-06-14 22:51:29 -04: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
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
telans
8620dfc18b
remove symlink 2020-06-15 10:46:44 +12:00
telans
afc9224ede
fix SA1111 2020-06-15 10:46:43 +12:00
telans
9b528aabc2
misc 2020-06-15 10:45:59 +12:00
telans
3d9049ef08
fix SA1508 2020-06-15 10:45:55 +12:00
telans
acd4389653
fix SA1005 2020-06-15 10:41:00 +12:00
telans
726e116d5b
fix SA1510 2020-06-15 10:40:57 +12: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
telans
4cb8fbfbbf
fix StyleCop warning in Jellyfin.MediaEncoding.Tests 2020-06-14 18:56:47 +12:00
crobibero
7b54a43cc1 Fix docs typo 2020-06-13 20:15:19 -06:00
crobibero
14f32b4927 Remove warnings from MediaBrowser.LocalMetadata 2020-06-13 20:04:53 -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
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
Chris Kapusta
b8d80bf09c
Update CONTRIBUTORS.md
Co-authored-by: Bond-009 <bond.009@outlook.com>
2020-06-13 14:32:42 -05:00
BaronGreenback
4d50941d44
Merge pull request #22 from jellyfin/master
another
2020-06-13 17:56:10 +01: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
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
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
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
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
BaronGreenback
306f7b3c30
Update INetworkManager.cs 2020-06-11 23:10:13 +01:00
BaronGreenback
2cecde658b
Update INetworkManager.cs
Editting comments - adding periods
2020-06-11 22:58:29 +01:00
Patrick Barron
7fba0b778e Properly remove profile images 2020-06-11 17:51:02 -04:00
BaronGreenback
4d9171f691
Update DlnaEntryPoint.cs
Left a _config behind.
2020-06-11 22:40:43 +01:00
aled
c722ad22ec Handle the case when the stored password is null, but the user tried to login with a password. 2020-06-11 20:33:46 +01: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
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
2020-06-11 23:30:22 +09:00
dkanada
ce9e7d47b7
Merge pull request #3293 from jellyfin/dependabot/nuget/System.Text.Encoding.CodePages-4.7.1
Bump System.Text.Encoding.CodePages from 4.7.0 to 4.7.1
2020-06-11 23:29:46 +09:00