Commit Graph

2263 Commits

Author SHA1 Message Date
Bond-009
b7421db5fe
Merge pull request #3578 from barronpm/displaypreferences-efcore
Migrate Display Preferences to EF Core
2020-08-01 21:51:49 +02:00
Patrick Barron
a59bc5c6a8 Fixed compilation error. 2020-07-23 20:57:59 -04:00
Patrick Barron
3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Pika
7331c02a21
Update MediaBrowser.Model/Entities/MediaStream.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-23 19:22:56 -04:00
Pika
ea4aa5ed8e
Update MediaBrowser.Model/Entities/MediaStream.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-23 19:13:19 -04:00
Pika
262daa6650
Update MediaBrowser.Model/Entities/MediaStream.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-23 19:13:02 -04:00
Pika
f5a3408c89
Update MediaBrowser.Model/Entities/MediaStream.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-23 19:12:52 -04:00
Pika
3b21abd879
Merge branch 'master' into more-track-titles 2020-07-23 18:59:25 -04:00
Bond-009
944fdb4c62
Merge pull request #3552 from BaronGreenback/NotificationFix
Fixes #3551 (Notifications Serialization error)
2020-07-23 10:34:32 +02:00
Patrick Barron
4742ddbb71 Update .NET Core to 3.1.6 2020-07-17 19:48:11 -04:00
Patrick Barron
ab396225ea Migrate Display Preferences to EF Core 2020-07-17 16:11:53 -04:00
BaronGreenback
6b4cea604c Suggested changes and removed some intellisense messages. 2020-07-17 16:19:06 +01:00
BaronGreenback
12478c7196
Update NotificationOption.cs
Fixes serialisation bug
2020-07-13 17:54:06 +01:00
dkanada
5e706ba7ce keep playstate during syncplay group creation 2020-07-13 06:55:03 +09:00
Joshua M. Boniface
f3151e7dc7
Merge pull request #3505 from Bond-009/minor3
Minor fixes
2020-07-05 00:30:35 -04:00
Bond_009
ae6eaa7f02 Minor fixes 2020-07-04 22:06:27 +02:00
Patrick Barron
6d1b00da64 Use Array.Empty 2020-07-04 11:54:25 -04:00
Bond-009
89ef8d79d6
Merge pull request #3465 from BaronGreenback/BugFix2
10.6.0.0 Null Pointer fix
2020-06-27 20:43:37 +02:00
BaronGreenback
2f4860741c _config.Configuration.PluginRespositories not instantiated causing InstallationManager.cs to crash with a null pointer. 2020-06-27 15:41:57 +01:00
dkanada
9a44e2912e
Merge pull request #3455 from jellyfin/values
Use constructor to set optimal config values
2020-06-27 05:58:07 +09:00
dkanada
83ae4d074d use constructor to set optimal config values 2020-06-27 00:22:27 +09:00
Cody Robibero
5f1b1dc3cc
fix nullability 2020-06-26 08:41:21 -06:00
Mark Monteiro
0e9164351b Merge remote-tracking branch 'upstream/master' into external-id-type 2020-06-26 10:12:22 -04:00
dkanada
4e08876028
Merge pull request #3418 from Bond-009/minor3
Minor changes
2020-06-23 16:56:44 +09:00
Bond-009
3d42f37538 Minor changes 2020-06-22 15:35:53 +02:00
Bond-009
464066f362
Merge pull request #3411 from neilsb/system-plugin-removal
Prevent system plugins from being uninstalled
2020-06-22 15:23:35 +02:00
dkanada
552a358c9c
Merge pull request #3244 from jellyfin/custom-repos
Initial implementation for custom plugin repositories
2020-06-22 22:08:43 +09:00
Neil Burrows
c20400fa40 Prevent system plugins from being uninstalled 2020-06-22 10:13:28 +01:00
telans
5bb639a59a
newlines after braces 2020-06-20 21:13:48 +12:00
telans
7f307f9082
brace multiline if statements 2020-06-20 21:12:36 +12:00
telans
98db8f72e0
fix SA1503 for one line if statements 2020-06-20 20:35:29 +12:00
telans
8de6452967
fix some documentation periods 2020-06-20 18:13:11 +12:00
crobibero
0651d7512b Enable BlurHash for People 2020-06-16 15:12:48 -06:00
dkanada
f5d82441a4
Merge branch 'master' into custom-repos 2020-06-17 02:09:32 +09:00
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops
Add full stop at end of comments (SA1629)
2020-06-16 11:54:58 +02:00
telans
247f9c61e6
fix SA1513/SA1516 2020-06-16 16:11:30 +12:00
telans
9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09: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
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
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
crobibero
a6815018dc Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00
aled
299e49f39d Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
artiume
b79957d07e Split HEVC VP9 10bit 2020-06-08 14:45:27 +03:00
Vasily
4999831604 Merge remote-tracking branch 'upstream/master' into hwaccel 2020-06-08 14:44:21 +03:00
dkanada
3f58bd7c58 disable nullable errors for new model 2020-06-07 21:26:50 +09:00
dkanada
52cd955a8f merge branch master into custom-repos 2020-06-07 21:23:15 +09:00
aled
22a860a806 Fix a small number of compile warnings 2020-06-06 20:17:49 +01:00