Commit Graph

3390 Commits

Author SHA1 Message Date
Gary Wilber
a51adec836 fix parallelism when set to 0 2020-10-02 18:26:10 -07:00
Gary Wilber
8f2fbf7a99 Switch to TPL dataflow for subfolder scan 2020-10-01 16:24:35 -07:00
Stanislav Ionascu
cd4641dca0 Remove PlayableStreamFileNames as unused
Since ffmpeg can play and transcode ISO files and BDMV folders directly,
there's no use of that property.
2020-10-01 22:20:34 +02:00
Stanislav Ionascu
3ad6232973 Add probe / direct-stream / transcoding support for BluRays
This commit (and ffmpeg built with libbluray support), adds support
for playback of bluray images (bd-iso) and bluray folders.
2020-10-01 21:59:57 +02:00
github@esslinger.dev
dd4f3a7c51 feat: convert supportedCommands strings to enums 2020-10-01 18:43:44 +02:00
Gary Wilber
c2276b17cb Increase library scan and metadata refresh speed 2020-09-30 19:33:34 -07:00
crobibero
53d8023def Update all on-disk plugins 2020-09-30 17:37:30 -06:00
Jim Cartlidge
fcd1b2f0e4 Merged with latest master 2020-09-30 17:52:33 +01:00
Bond-009
7775066475
Merge pull request #4236 from ConfusedPolarBear/warnings1
Fix some warnings
2020-09-29 09:18:52 +02:00
Matt Montgomery
53d5f64e03 Fix SA1513, SA1514, SA1507, and SA1508 2020-09-28 15:04:31 -05:00
Gary Wilber
eb04773c79 Use the get or add argument 2020-09-27 17:34:36 -07:00
Gary Wilber
50c9083bc0 remove unnecessary parentheses 2020-09-27 17:25:08 -07:00
Gary Wilber
449f7e1b1e update based on suggestions 2020-09-27 17:24:12 -07:00
Gary Wilber
89041982c2 Use ConcurrentDictionary's in DirectoryService 2020-09-27 17:02:10 -07:00
Niels van Velzen
72534f9d66 Use SessionMessageType for WebSocket messages 2020-09-27 10:00:20 +02:00
Jim Cartlidge
5edf24db5c Updated to master 2020-09-24 15:34:30 +01:00
Anthony Lavado
2746e1fecc
Merge pull request #4189 from Bond-009/minor5
Minor improvements
2020-09-23 09:58:19 -04:00
Bond_009
228b33a23b Minor improvements 2020-09-20 14:02:41 +02:00
nyanmisaka
db07510017 add tonemap for AMD AMF 2020-09-17 19:16:23 +08:00
Jim Cartlidge
b44455ad0d Update based on PR1 changes. 2020-09-14 15:46:38 +01:00
crobibero
46ae51bc9a update to dotnet 3.1.8 2020-09-12 10:19:04 -06:00
Jim Cartlidge
9ef79d190b Large number of files 2020-09-12 16:41:37 +01:00
crobibero
97e948bbf6 Fix added warnings 2020-09-11 16:11:19 -06:00
crobibero
f13b87afa3 Merge remote-tracking branch 'upstream/master' into api-upload-subtitle 2020-09-11 15:53:04 -06:00
Bond_009
48e1cf9fd7 Minor performance improvements to item saving 2020-09-09 13:38:27 +02:00
BaronGreenback
cf87b3afb7 Remove excess code. 2020-09-07 12:28:48 +01:00
Joshua M. Boniface
559a7fc336
Merge pull request #3442 from nyanmisaka/tonemap
Tonemapping function relying on OpenCL filter and NVENC HEVC decoder
2020-09-04 10:06:15 -04:00
Bond-009
5e76d5fd56
Merge pull request #3879 from cvium/fix_theme_songs
Populate ThemeVideoIds and ThemeSongIds
2020-09-04 13:13:39 +02:00
Patrick Barron
d814302707 Merge branch 'master' into scoped-displaypreferences 2020-09-03 15:15:43 -04:00
Nyanmisaka
4cb0a57e46
Merge branch 'master' into tonemap 2020-09-04 02:55:57 +08:00
Joshua M. Boniface
52aea85e7f
Merge pull request #4031 from Bond-009/warn28
Fix some warnings
2020-09-03 14:40:29 -04:00
Bond-009
9cbc016b0a
Merge pull request #3877 from orryverducci/deinterlace-improvements
Deinterlacing improvements
2020-09-03 20:38:54 +02:00
crobibero
5ad81f7fe6 Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-09-03 09:29:07 -06:00
Anthony Lavado
a2d6ea2eed
Merge pull request #4043 from cvium/remove_shit_and_shit_adjacent_shit
Split HttpListenerHost into middlewares
2020-09-03 09:45:17 -04:00
Claus Vium
abc527329d Sort by SortName after scanning 2020-09-03 14:49:02 +02:00
Bond-009
8c28824c88
Merge pull request #4042 from jellyfin/ci-packaging-fixes
Fixes for CI Nuget package pushing and CI triggers
2020-09-03 12:56:04 +02:00
Claus Vium
2f79c3095b Fix startup message 2020-09-03 11:54:38 +02:00
Claus Vium
571d0570f5 Kill HttpListenerHost 2020-09-03 11:32:22 +02:00
Claus Vium
5813f8073c Move HttpListenerHost middleware up the pipeline 2020-09-03 00:32:56 +02:00
Bond-009
52b34eb407
Merge pull request #4039 from cvium/remove_shit_and_shit_adjacent_shit
Remove ServiceStack and related stuff
2020-09-02 23:18:32 +02:00
Erwin de Haan
346581bb2a Fixes for CI Nuget package pushing and CI triggers
Also adds SourceLink support and symbols that are pushed to Nuget.
Add symbols to main nuget packages for unstable builds (Azure Artifacts does not support symbols outside of the main package)
SourceLink will enable stepping during debugging.
2020-09-02 22:42:00 +02:00
Erwin de Haan
208b00fbb1 Add the item path to the ItemLookupInfo class.
This is important for the Shoko Anime Meatdata provider plugin.
2020-09-02 20:11:31 +02:00
Claus Vium
12710cdf42 More fixes 2020-09-02 13:06:14 +02:00
Claus Vium
e337756428 Remove ServiceStack and related stuff 2020-09-02 12:22:14 +02:00
Bond_009
e653eef44f Fix some warnings 2020-08-31 22:20:19 +02:00
David Ullmer
2a84d5a693 Enable nullable for interface 2020-08-31 16:35:37 +02:00
David Ullmer
b7c07f6821 Merge branch 'master' into library-pictures 2020-08-31 16:16:01 +02:00
crobibero
bd66fd25df Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-31 08:00:05 -06:00
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
crobibero
b02650ec2f use proper spdx 2020-08-26 07:39:01 -06:00
crobibero
5f60da29c7 switch to spdx 2020-08-26 07:36:57 -06:00
crobibero
670c41ee89 Properly pack project license 2020-08-25 21:33:19 -06:00
Joshua M. Boniface
e83f6d6ec7
Merge pull request #3889 from Ullmie02/nuget-versioning
Build Unstable NuGet packages
2020-08-25 17:08:06 -04:00
Patrick Barron
b5bbbb9cef Document SubtitleDownloadFailureEventArgs 2020-08-24 20:34:53 -04:00
Patrick Barron
2eb9a3670b Document PlaybackStartEventArgs 2020-08-24 20:34:42 -04:00
Patrick Barron
71c33d09c4 Document IEventConsumer 2020-08-24 20:34:33 -04:00
Patrick Barron
9fa4fff15d Merge branch 'master' into event-rewrite-1
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
2020-08-24 20:04:13 -04:00
crobibero
9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
Bond_009
c4d8275fc1 Fix duplicate 2020-08-23 00:26:32 +02:00
Bond_009
5ec1a979b2 Remove extra newline 2020-08-22 21:57:28 +02:00
Bond_009
404bb4f835 Enable TreatWarningsAsErrors for MediaBrowser.Controller in Release 2020-08-22 21:56:24 +02:00
Bond_009
2b832de289 Fix build 2020-08-21 22:19:16 +02:00
Bond_009
119f64f5e7 Make some methods async 2020-08-21 22:01:19 +02:00
David
a3020f2917 Use backdrop with library name as library thumbnail 2020-08-21 19:53:55 +02:00
nyanmisaka
54349fc945 fix outputSize 2020-08-20 19:08:36 +08:00
Bond_009
ab2147751f Make MediaBrowser.MediaEncoding warnings free 2020-08-20 12:16:24 +02:00
Patrick Barron
98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
Bond_009
68edccd9f4 More warn 2020-08-19 18:02:34 +02:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
Matt Montgomery
5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
crobibero
1325815182 Remove IHttpClient from Providers 2020-08-17 13:10:02 -06:00
crobibero
2e0c2336cc Remove IHttpClient from IRemoteImageProvider 2020-08-17 11:51:53 -06:00
Matt Montgomery
035d29fb35 Migrate to new API standard 2020-08-16 14:45:39 -05:00
Bond-009
ec12675feb
Merge pull request #3891 from barronpm/remove-unused-methods
Remove unused methods in IDtoService
2020-08-16 17:06:47 +02:00
Patrick Barron
a40064a146 Migrate ServerEventNotifier.OnPackageInstallationCancelled to IEventConsumer 2020-08-15 23:20:41 -04:00
Patrick Barron
b7ceb40d6e Migrate ServerEventNotifier.OnPackageInstalling to IEventConsumer 2020-08-15 18:57:46 -04:00
Patrick Barron
816c80525a Use IEventManager in UserManager 2020-08-15 15:55:15 -04:00
Orry Verducci
396148599a
Fix indentation in deinterlace if block
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-08-15 12:55:58 +01:00
Patrick Barron
8570cfdba6 Migrate ActivityLogEntryPoint.OnSessionEnded to IEventConsumer 2020-08-15 02:07:28 -04:00
Patrick Barron
ca3a8bdb98 Migrate ActivityLogEntryPoint.OnSessionStarted to IEventConsumer 2020-08-15 02:02:58 -04:00
Patrick Barron
e924444880 Migrate ActivityLogEntryPoint.OnPluginUpdated to IEventConsumer 2020-08-14 15:50:17 -04:00
Patrick Barron
0da7c0568d Migrate ActivityLogEntryPoint.OnPluginUninstalled to IEventConsumer 2020-08-14 15:22:12 -04:00
Patrick Barron
b7f21971f4 Migrate ActivityLogEntryPoint.OnPluginInstalled to IEventConsumer 2020-08-14 15:21:17 -04:00
Patrick Barron
ca1f15af19 Move GenericEventArgs to Jellyfin.Data.Events 2020-08-13 20:52:55 -04:00
Patrick Barron
3e5fe04427 Migrate ActivityLogEntryPoint.OnPlaybackStart to IEventConsumer 2020-08-13 20:32:54 -04:00
Patrick Barron
57e2f7248d Remove unused class and rename file. 2020-08-13 20:30:43 -04:00
Patrick Barron
285af300f5 Create IEventConsumer and IEventManager 2020-08-13 20:29:14 -04:00
Orry Verducci
9438a50976 Correct parentheses 2020-08-13 21:23:12 +01:00
Patrick Barron
e0c6172d23 Add ServiceProvider to IServerApplicationHost 2020-08-13 16:10:26 -04:00
David
b92fbe4d69 Use VersionPrefix 2020-08-13 19:03:24 +02:00
Anthony Lavado
dbc1435a9e
Merge pull request #3671 from Bond-009/unixsocket
Make UNIX socket configurable
2020-08-13 13:02:02 -04:00
Patrick Barron
2be1865b42 Remove unused methods in IDtoService 2020-08-13 12:50:04 -04:00
David
a61f6e3308 Fix nuget ci 2020-08-13 15:22:12 +02:00
crobibero
6709645ec9 bump deps 2020-08-12 15:52:29 -06:00
Matt Montgomery
4fa3d3f4f3 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-12 15:38:07 -05:00
cvium
e10693cbe0 Remove some LINQ queries 2020-08-12 22:14:14 +02:00
cvium
1ae3dc202c Populate ThemeVideoIds and ThemeSongIds 2020-08-11 22:04:41 +02:00
Orry Verducci
2d6699fd47 Merge remote-tracking branch 'upstream/master' into deinterlace-improvements 2020-08-10 22:17:13 +01:00
Orry Verducci
ce51775e74 Apply double rate option to hardware deinterlacers 2020-08-10 22:16:46 +01:00
Orry Verducci
9dc95074a3 Add bwdif and simplify software deinterlacing 2020-08-10 22:16:23 +01:00
Orry Verducci
7df2affb23 Add double rate deinterlacing option 2020-08-10 22:14:47 +01:00
Bond-009
6c92154a9b
Update MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
Co-authored-by: David <davidullmer@outlook.de>
2020-08-09 13:55:57 +02:00
Patrick Barron
229a5d9e0b Make DisplayPreferencesManager scoped 2020-08-08 13:39:49 -04:00
crobibero
f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Nyanmisaka
c23d991c95
Merge branch 'master' into tonemap 2020-08-03 14:58:44 +08:00
Nyanmisaka
7b3f76b81f
resolve conflicts 2020-08-03 14:55:28 +08:00
Joshua M. Boniface
47e63def20
Merge pull request #3728 from jellyfin/qsv-cutter
Adjust priority in outputSizeParam cutter
2020-08-02 20:30:33 -04:00
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
Nyanmisaka
2139e9f8d1
adjust priority in outputSizeParam cutter 2020-07-28 17:07:10 +08:00
Patrick Barron
68a185fd02 Serialize/deserialize new entities properly. 2020-07-27 20:40:21 -04:00
Matt Montgomery
31d3b1b83a Cleanup interfaces 2020-07-27 15:40:14 -05:00
Nyanmisaka
17527d68df
fix build 2020-07-27 14:11:05 +08:00
Nyanmisaka
df6b303da7
Merge branch 'master' into tonemap 2020-07-27 13:57:40 +08:00
Matt Montgomery
3c91aa0c3d Code cleanup 2020-07-26 23:13:14 -05:00
Matt Montgomery
a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05:00
Nyanmisaka
3e55632807
remove spaces 2020-07-27 01:41:27 +08:00
不帅你报警
30bfa5536f
Update MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
Co-authored-by: Nyanmisaka <nst799610810@gmail.com>
2020-07-27 01:34:36 +08:00
不帅你报警
d5dcb12407
Update EncodingHelper.cs
Fix the problem that hardware decoding cannot be used on macOS.
2020-07-26 23:47:29 +08:00
Nyanmisaka
95b961c864
remove unused line 2020-07-26 12:38:57 +08:00
nyanmisaka
5716453542 minor changes 2020-07-25 01:03:34 +08:00
nyanmisaka
4bdb870d16 Merge remote-tracking branch 'upstream/master' into tonemap 2020-07-25 00:58:14 +08:00
nyanmisaka
7b862bba5a add Tonemapping relaying on nvdec and ocl 2020-07-25 00:57:34 +08:00
Bond_009
928bc6c787 Fix build 2020-07-24 16:42:28 +02:00
Bond-009
3ff110984a
Merge branch 'master' into readonlyspan 2020-07-24 09:40:44 +02:00
Bond-009
1cc62d6afa
Update MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
Co-authored-by: David Mouse <dmouse10462@gmail.com>
2020-07-24 09:36:18 +02:00
Patrick Barron
3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Joshua M. Boniface
845ee21ddc
Merge pull request #3664 from Bond-009/createuserasync
Make CreateUser async
2020-07-23 18:08:29 -04:00
Joshua M. Boniface
8960d6256f
Merge pull request #3659 from Bond-009/stringbuilder
Optimize StringBuilder.Append calls
2020-07-23 18:08:09 -04:00
Joshua M. Boniface
0d446c8755
Merge pull request #3609 from Bond-009/warn21
Fix warnings
2020-07-23 18:06:34 -04:00
Joshua M. Boniface
22cc602117
Merge pull request #3366 from barronpm/remove-usermanager-addparts
Remove UserManager.AddParts
2020-07-23 18:05:57 -04:00
Bond_009
cbe47325b3 Make UNIX socket configurable 2020-07-23 13:18:47 +02:00
Bond_009
6cbfae209d Make CreateUser async 2020-07-22 20:57:29 +02:00
Bond_009
b9004a0246 Fix build 2020-07-22 14:56:58 +02:00
Bond_009
4d681e3cad Optimize StringBuilder.Append calls 2020-07-22 14:34:51 +02:00
Bond_009
febb6bced6 Review usage of string.Substring (part 1)
Reduced allocations by replacing string.Substring with ReadOnlySpan<char>.Slice
2020-07-22 13:39:24 +02:00
David
90039e1ad3 Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs
2020-07-22 11:02:44 +02:00
Nyanmisaka
d4c6415f99
minor changes 2020-07-21 11:41:28 +08:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
Nyanmisaka
5f89e81306
fix qsv device creation on Comet Lake
reddit: https://www.reddit.com/r/jellyfin/comments/huct4x/jellyfin_1060_released/fyn30ds
2020-07-20 20:48:20 +08:00
Bond_009
7324b44c43 Fix warnings 2020-07-20 11:01:37 +02:00
Joshua M. Boniface
0b73f3d646
Merge pull request #3569 from nyanmisaka/textsub-fix
Fix QSV subtitle burn-in on windows and P010 detect
2020-07-19 16:59:58 -04:00
David
3514813eb4 Continute work 2020-07-19 19:03:48 +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
Nyanmisaka
77f9417d84
enhance platform check and 10bit detect 2020-07-17 19:32:15 +08:00
Nyanmisaka
e1ba1fcebe
fix indent 2020-07-17 01:41:24 +08:00
Nyanmisaka
c1c1a2f751
Match the size of subtitle stream and video stream 2020-07-17 01:30:35 +08:00
Nyanmisaka
32fb34a4cc
Fix QSV subtitle burn-in on windows and P010 detect 2020-07-16 21:09:04 +08:00
Max Git
b356ff6c89 Simplify name of IsCopyDoc 2020-07-15 06:58:36 +02:00
Max Git
87f5a6bdb3 Move videostream null check to start of GetHardwareAcceleratedVideoDecoder 2020-07-15 05:56:05 +02:00
dkanada
87d7c4a62e
Merge pull request #3500 from nyanmisaka/vpp-qsv
Add FFmpeg 4.3 detection and solve the green line on QSV HWA
2020-07-14 20:31:13 +09:00
Patrick Barron
3b085f6a03 Remove UserManager.AddParts 2020-07-13 17:25:50 -04:00
dkanada
5e706ba7ce keep playstate during syncplay group creation 2020-07-13 06:55:03 +09:00
Bond-009
fb91e4fc23
Merge pull request #3502 from barronpm/array-empty
Use Array.Empty
2020-07-04 23:10:45 +02:00
Patrick Barron
6d1b00da64 Use Array.Empty 2020-07-04 11:54:25 -04:00
nyanmisaka
ce85cea9fa solve the green line issue on QSV 2020-07-04 19:21:16 +08:00
Joshua M. Boniface
46f67c9ea4
Merge pull request #3423 from crobibero/easypassword
Remove EasyPassword from Authentication providers
2020-07-04 00:25:00 -04:00
Neil Burrows
4389773508 Respect FFMpeg path passed via Environment Variable 2020-06-29 17:17:28 +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
Mark Monteiro
0e9164351b Merge remote-tracking branch 'upstream/master' into external-id-type 2020-06-26 10:12:22 -04:00
dkanada
57caa9fdba
Merge pull request #3435 from crobibero/revert-missing-fields
revert missing session fields
2020-06-26 06:21:00 +09:00
dkanada
d0bc93e947
Merge pull request #3437 from barronpm/fix-user-delete
Fix User Deletion
2020-06-26 06:17:23 +09:00
dkanada
bb7444db07
Merge pull request #3439 from cvium/ignore_application_folders
Never ignore application folders
2020-06-26 06:14:19 +09:00
Claus Vium
0f07b19ca5 Remove AllowIgnorePath 2020-06-25 11:33:10 +02:00
Patrick Barron
5ee419ebe4 Fix typo 2020-06-24 21:07:39 -04:00
Patrick Barron
9a01cd8590 Fix user deletion. 2020-06-24 20:19:47 -04:00
crobibero
ef8bec23c4 revert missing session fields 2020-06-24 15:09:15 -06:00
crobibero
1398c2117c Revert ILoggerFactory usage in BaseItem.cs 2020-06-23 07:31:59 -06:00
crobibero
f4d8e0e20c Merge remote-tracking branch 'upstream/master' into easypassword 2020-06-22 20:23:06 -06:00
David
1c78482b48 Use authorization code from api-migration to fix startup wizard 2020-06-20 18:02:03 +02:00
telans
6556bec646
brace multiline if statements (cont.) 2020-06-20 21:19:16 +12: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
8e3d874802
remove regions 2020-06-20 18:20:33 +12:00
telans
8de6452967
fix some documentation periods 2020-06-20 18:13:11 +12:00
telans
afe09612e8
fix SA1119 2020-06-20 18:13:11 +12:00
ConfusedPolarBear
e2f16fc255 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-06-19 23:33:43 -05:00
ConfusedPolarBear
329980c727 API cleanup 2020-06-19 23:33:07 -05:00
ConfusedPolarBear
4be476ec53 Move all settings into the main server configuration
Decreased the timeout from 30 minutes to 5.
Public lookup values have been replaced with the short code.
2020-06-19 23:32:24 -05: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
crobibero
a8adbef74f Add GetAuthorizationInfo for netcore HttpRequest 2020-06-15 13:21:18 -06:00
crobibero
4aac936721 Add more authorization handlers, actually authorize requests 2020-06-15 12:49:54 -06:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel 2020-06-15 20:21:25 +09: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
crobibero
589735f60c Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-14 20:15:26 -06: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
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
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
crobibero
829eb1a849 merge master into api-migration 2020-06-13 13:03:09 -06:00
dkanada
403cd3205f
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
2020-06-13 00:29:43 +09: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