Stepan Goremykin
910617bbc3
Remove redundant 'else' keywords
2023-04-06 19:38:34 +02:00
Stepan Goremykin
7d7e177265
Remove redundant casts
2023-04-06 19:17:28 +02:00
Stepan Goremykin
26958162d0
Remove unused using directives
2023-04-06 19:17:28 +02:00
Bond-009
9c500bdca3
Merge pull request #9466 from Shadowghost/playlist-fix
2023-03-28 10:58:48 +02:00
Cody Robibero
89be3aa37f
Convert Person.Type to use PersonKind enum ( #9487 )
2023-03-25 11:52:02 -06:00
Bond-009
2ce08eb184
Merge pull request #9388 from Shadowghost/output-bitrate-channels-master
2023-03-20 17:46:11 +01:00
Shadowghost
e57c33c442
Add DCA and TrueHD to fMP4 audio codecs to support remuxing
2023-03-19 15:07:01 +01:00
Shadowghost
520c07e8ca
Merge branch 'master' into network-rewrite
2023-03-16 11:07:22 +01:00
Bond-009
cf1cb2eea5
Merge pull request #9418 from Bond-009/getawaiter
2023-03-15 18:30:03 +01:00
Bond-009
0c6e2e27a8
Merge pull request #9460 from Shadowghost/rating-overhaul
2023-03-15 12:09:59 +01:00
Shadowghost
21dcf775be
Add config option to disable dummy chapter generation ( #9410 )
2023-03-14 16:20:12 -06:00
Bond_009
d8ec3a5470
Reduce usage of GetAwaiter().GetResult()
2023-03-14 12:05:49 +01:00
Shadowghost
76ae599bd3
Fix playlist creation and removal
2023-03-10 19:16:35 +01:00
Bond-009
6351d1022b
Merge pull request #9254 from Shadowghost/dvdbdfix
2023-03-10 15:48:35 +01:00
Shadowghost
0da5255f12
Apply review suggestions
2023-03-10 15:27:17 +01:00
Shadowghost
47aa07c342
Fix DLNA playback of DVD and BD folders
2023-03-10 15:27:17 +01:00
Shadowghost
2403a0a367
Apply review suggestions
2023-03-10 15:27:05 +01:00
nyanmisaka
638bda629b
Backport pull request #9391 from jellyfin/release-10.8.z
...
Fix H.264 baseline hwaccel and enable enhanced Nvdec by default
Original-merge: 22a8283a9e
Merged-by: Bond-009 <bond.009@outlook.com>
Backported-by: crobibero <cody@robibe.ro>
2023-03-09 19:35:54 -05:00
Shadowghost
65090ac817
Backport pull request #9351 from jellyfin/release-10.8.z
...
Fix EqualsAny condition check for int and double
Original-merge: e8b0ae07af
Merged-by: Bond-009 <bond.009@outlook.com>
Backported-by: crobibero <cody@robibe.ro>
2023-03-09 19:33:51 -05:00
Shadowghost
daefdaf8b0
Extend language code handling
2023-03-09 14:38:20 +01:00
Bond_009
dab75d35d2
Enable nullable for more files
2023-03-07 21:51:48 +01:00
Bond_009
891e2495c9
Disable real time monitoring by default
2023-03-07 17:59:29 +01:00
Shadowghost
80b8661008
Merge branch 'master' into network-rewrite
2023-03-03 10:42:24 +01:00
Shadowghost
c760a50d59
Apply review suggestions
2023-02-27 16:03:12 +01:00
Shadowghost
9880a2b3e1
Enforce HLS codec restrictions
2023-02-27 10:38:50 +01:00
knackebrot
aa99aaebc4
Add audio vbr calculation
2023-02-26 22:37:01 +01:00
Shadowghost
a5f16136eb
Apply review suggestions
2023-02-20 16:58:22 +01:00
Shadowghost
c5a363a007
Merge branch 'master' into network-rewrite
2023-02-20 11:58:14 +01:00
Shadowghost
9d21f078c7
Add default rating selections
2023-02-20 11:53:20 +01:00
Shadowghost
e014522dff
Add default for MaxParentalRating to UserPolicy
2023-02-20 11:53:20 +01:00
Bond-009
720852f708
Merge pull request #9356 from Bond-009/tryparse
2023-02-20 11:09:54 +01:00
Bond_009
24a7e210c3
Optimize tryparse
...
* Don't check for null before
* Don't try different formats when not needed (NumberFormat.Integer is the fast path)
2023-02-19 16:52:29 +01:00
Bond-009
bb6f867067
Merge pull request #9322 from Bond-009/nullable
2023-02-19 15:08:35 +01:00
Shadowghost
af7acc000c
Fix dependency on Microsoft.AspNetCore.HttpOverrides
2023-02-18 21:10:09 +01:00
Shadowghost
20fd05b050
Consistently write IP in upercase
2023-02-17 19:27:36 +01:00
Shadowghost
42498194d9
Replace ISocket and UdpSocket, fix DLNA and SSDP binding and discovery
2023-02-17 17:39:11 +01:00
Bond_009
60f41b80f6
Verify ContentType of uploaded images
2023-02-16 15:08:01 +01:00
Bond_009
cb85fc688f
Enable nullable for more files
2023-02-15 23:41:28 +01:00
Shadowghost
3a91c37283
Merge branch 'master' into network-rewrite
2023-02-15 22:40:07 +01:00
Shadowghost
b7418d6e9e
Add permission for collection management
2023-02-13 15:42:04 +01:00
Bond-009
f5417c50f7
Merge pull request #9139 from Jpuc1143/tag-whitelist
2023-02-11 23:52:09 +01:00
Telepathic Walrus
06b40980f4
Fix transcoded audio not playing ( #9251 )
2023-02-05 19:27:50 +00:00
Shadowghost
979964ef4b
Force transcode/remux for DVDs and BDs
2023-02-05 12:00:29 +01:00
Shadowghost
519709bf10
Revert "Remove DvdLib ( #9068 )"
...
This reverts commit db1913b08f
.
2023-02-04 18:36:47 +01:00
Zoltan Csizmadia
e0519189b2
Use Directory.Packages.props ( #9135 )
...
Co-authored-by: Zoltan Csizmadia <CsizmadiaZ@valassis.com>
2023-02-04 10:15:08 -07:00
Patrick Barron
fec23de427
Remove Emby.Notifications ( #9147 )
2023-01-28 07:43:55 -07:00
Cody Robibero
abffd160c3
Remove ability to add a played indicator to images ( #9186 )
2023-01-28 07:43:13 -07:00
Patrick Barron
63b0132562
Remove OS information from System Info ( #9175 )
...
Co-authored-by: Bond-009 <bond.009@outlook.com>
2023-01-26 09:05:00 +01:00
Shadowghost
414eb45899
Merge branch 'master' into network-rewrite
2023-01-24 23:48:47 +01:00
Dmitry Lyzo
2b1a7ddd32
Backport pull request #9060 from jellyfin/release-10.8.z
...
Disable splash screen image by default
Original-merge: 31673cc27d
Merged-by: Bill Thornton <thornbill@users.noreply.github.com>
Backported-by: Joshua M. Boniface <joshua@boniface.me>
2023-01-22 14:05:38 -05:00
Dmitry Lyzo
28b98cacc8
Backport pull request #9051 from jellyfin/release-10.8.z
...
Fix transcode reasons
Original-merge: 1dea309ae4
Merged-by: Joshua M. Boniface <joshua@boniface.me>
Backported-by: Joshua M. Boniface <joshua@boniface.me>
2023-01-22 14:05:37 -05:00
Jpuc1143
7fa6d4c81e
Add "Allowed Tags" to Parental Controls
2023-01-20 16:43:59 -03:00
Shadowghost
a728f0993e
Merge branch 'master' into network-rewrite
2023-01-20 14:20:56 +01:00
Patrick Barron
db1913b08f
Remove DvdLib ( #9068 )
...
* Remove DvdLib
* Update error message for blu-ray folders
Co-authored-by: Shadowghost <Shadowghost@users.noreply.github.com>
* Remove BDInfo
* Remove MediaEncoder.GetPrimaryPlaylistVobFiles
* Remove BlurayDiscInfo
Co-authored-by: Shadowghost <Shadowghost@users.noreply.github.com>
2023-01-20 13:29:45 +01:00
Shadowghost
656a0bff6f
Merge remote-tracking branch 'upstream/master' into network-rewrite
2023-01-19 10:09:32 +01:00
renovate[bot]
e408da4651
chore(deps): update dependency microsoft.codeanalysis.bannedapianalyzers to v3.3.4 ( #9117 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-01-18 04:16:59 -07:00
Bond-009
212876b235
Merge pull request #9100 from barronpm/refactor-startup
2023-01-17 21:11:32 +01:00
Patrick Barron
c59f2a3c46
Mark CanSelfRestart as Obsolete
2023-01-17 14:49:05 -05:00
Hannes Braun
66eff8b9ca
Allow limiting parallel image encodings to reduce memory usage ( #8783 )
2023-01-16 10:06:44 -07:00
Bond-009
3a7a781ed9
Merge pull request #9001 from Shadowghost/stereo-downmix
...
Fixes https://github.com/jellyfin/jellyfin/issues/1986
2023-01-12 09:49:29 +01:00
Shadowghost
407c716f82
Add stereo downmix algorithm selection.
2023-01-10 15:29:39 +01:00
Bond-009
69a51c425a
Fix all warnings in Jellyfin.Api ( #9003 )
2023-01-04 08:01:31 -07:00
Bond-009
43c3a465e6
Merge pull request #8775 from SenorSmartyPants/DVRMetadata
...
Fixes https://github.com/jellyfin/jellyfin/issues/5178
2023-01-03 12:01:32 +01:00
Cody Robibero
9a740344be
Add support for .sup subtitle ( #8808 )
...
Fixes https://github.com/jellyfin/jellyfin/issues/8628
2022-12-30 08:24:06 -07:00
Bond-009
817996da4b
Merge pull request #7494 from Shadowghost/streambuilder-cleanup
2022-12-29 15:21:28 +01:00
Brad Beattie
4ee1b78a80
Fix image searching to prioritize explicit language match if searching in English ( #8946 )
2022-12-29 15:15:48 +01:00
Shadowghost
ef085483b2
Merge branch 'master' into network-rewrite
2022-12-20 09:19:45 +01:00
renovate[bot]
02f9e60e7c
chore(deps): update dotnet monorepo to v7.0.1 ( #8900 )
...
* chore(deps): update dotnet monorepo to v7.0.1
* Update docker sdk
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Cody Robibero <cody@robibe.ro>
2022-12-15 20:13:11 -07:00
Shadowghost
81a7261980
Default to no bitrate limit if no maxBitrate is set ( #8850 )
...
Fixes https://github.com/jellyfin/jellyfin/issues/3277
2022-12-14 22:04:05 +01:00
Joe Rogers
a74b8b99af
Add option to allow extras to use embedded titles
2022-12-08 01:00:35 -05:00
Shadowghost
0834dc58c1
Fix .Net 7 compatibility
2022-12-07 18:06:04 +01:00
Shadowghost
8e8a085b7e
Prefer var in StreamBuilder
2022-12-07 18:00:44 +01:00
Shadowghost
08a5c71b90
Add xmldoc for MediaOptions
2022-12-07 18:00:03 +01:00
Shadowghost
1cd7da8889
Apply review suggestions
2022-12-07 18:00:03 +01:00
Shadowghost
697efec86e
Cleanup and refactor streambuilder
2022-12-07 18:00:01 +01:00
Shadowghost
2c86bd1875
Merge branch 'master' into network-rewrite
2022-12-07 17:40:24 +01:00
Bond_009
fd9dc1e308
Update deps
2022-12-07 16:56:32 +01:00
Bond_009
b366dc2e6e
Use ArgumentException.ThrowIfNullOrEmpty
2022-12-07 16:43:59 +01:00
Bond_009
236dd650d0
Update projects to .net7
2022-12-07 16:42:05 +01:00
Bond_009
52194f56b5
Replace != null with is not null
2022-12-05 15:01:13 +01:00
Bond_009
c7d50d640e
Replace == null with is null
2022-12-05 15:00:20 +01:00
Bond-009
210a4921f2
Fix some warnings and only disable TreatWarningsAsErrors for CodeAnalysis ( #8709 )
2022-12-05 13:54:28 +01:00
Shadowghost
bcd992fb06
Merge remote-tracking branch 'upstream/master' into network-rewrite
2022-12-03 12:44:45 +01:00
SteveTheGrey
87d4ef7403
Minor search update - full word titles matches first ( #8757 )
2022-11-27 09:03:28 -07:00
Negulici-R. Barnabas
e977aade77
Merge branch 'jellyfin:master' into master
2022-11-26 10:56:23 +02:00
SenorSmartyPants
159a244654
Add Options to disable DVR NFO and image saving
...
- SaveRecordingNFO and SaveRecordingImages default to true. Maintains current behavior.
- Episode.FillMissingEpisodeNumbersFromPath for live tv so external metadata can be pulled when recording starts.
2022-11-19 14:14:41 -06:00
Shadowghost
2e639c77c7
Apply review suggestions
2022-11-17 18:54:35 +01:00
Shadowghost
072651c4be
Add xmldocs for TMDb provider, correct provider spelling
2022-11-17 11:16:20 +01:00
Dominik
09a1d6786a
Increase default SegmentKeepSeconds
2022-11-15 16:06:24 +01:00
Negulici-R. Barnabas
d3580f25da
fixed namescope for ImageResolution enum;
2022-11-14 16:57:30 +02:00
Negulici-R. Barnabas
2036f58b18
added associated value to ImageResolution enum;
2022-11-14 16:48:45 +02:00
Dominik
832b36562a
Add new options for segment deletion
2022-11-14 10:11:25 +01:00
Negulici-R. Barnabas
7db1813cc8
changed ChapterImageResolution in model to enum type;
...
added 144p to the ImageResolution enum;
updated chapters limit comment inside FFProbeVideoInfo.cs;
2022-11-13 16:23:21 +02:00
Negulici-R. Barnabas
b7aa5ed862
Merge branch 'jellyfin:master' into master
2022-11-13 15:29:16 +02:00
Bond-009
a9e2acc9e4
Merge pull request #8666 from dmitrylyzo/fix-secondary-audio
...
Fixes https://github.com/jellyfin/jellyfin-web/issues/4044
Fixed https://github.com/jellyfin/jellyfin/issues/8673
2022-11-13 12:10:52 +01:00
renovate[bot]
42399dde9c
chore(deps): update dotnet monorepo ( #8708 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Cody Robibero <cody@robibe.ro>
2022-11-09 19:09:09 -07:00
Dmitry Lyzo
2eb00bf3c0
fix secondary audio
...
Browsers (Chrome, Firefox) can only play the first track,
even if the second track is the default.
Ignore default flag when testing on secondary audio.
External audio tracks are not secondary.
2022-10-31 15:49:34 +03:00
Niels van Velzen
16ad39e581
Add SeriesStatus.Unreleased
2022-10-30 14:27:21 +01:00
Bond-009
f6e7313a61
Merge pull request #8638 from photonconvergence/fix/extras-type
2022-10-30 14:17:14 +01:00
Maxr1998
bf059d5b58
Backport pull request #8411 from jellyfin/release-10.8.z
...
Allow direct play even if no audio stream is available
Original-merge: bf129ab9b8
Merged-by: Claus Vium <cvium@users.noreply.github.com>
Backported-by: Joshua M. Boniface <joshua@boniface.me>
2022-10-28 22:38:56 -04:00
photonconvergence
09e8a7e62c
Fix extra type differentiation
...
Change rules for Featurettes and Shorts so they don't both get classed as ExtraType.Clip.
Fix test that these changes break
2022-10-27 18:01:04 -07:00
adrez99
3736e360e7
Merge branch 'jellyfin:master' into gzip
2022-10-11 18:18:21 +02:00
Claus Vium
05c20001c8
Merge pull request #8381 from 1hitsong/lyric-lrc-file-support
2022-10-07 15:21:42 +02:00
Joe Rogers
2e4db18ebe
Add hearing impaired subtitle stream indicator ( #7379 )
...
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2022-10-07 12:38:05 +02:00
Shadowghost
7b90fcd053
Merge branch 'master' into network-rewrite
2022-10-07 09:16:02 +02:00
Claus Vium
719e5eae16
Merge pull request #8503 from Bond-009/ThrowIfNull
2022-10-07 07:50:39 +02:00
Jan Sommer
87d460909f
Fix minor warnings in MediaBrowser.Model/Configuration ( #2149 )
2022-10-06 21:44:12 +02:00
Bond_009
a9a5fcde81
Use ArgumentNullException.ThrowIfNull helper method
...
Did a simple search/replace on the whole repo (except the RSSDP project)
This reduces LOC and should improve performance (methods containing a throw statement don't get inlined)
```
if \((\w+) == null\)
\s+\{
\s+throw new ArgumentNullException\((.*)\);
\s+\}
```
```
ArgumentNullException.ThrowIfNull($1);
```
2022-10-06 20:21:23 +02:00
Shadowghost
4fc52a840c
Merge branch 'master' into network-rewrite
2022-10-01 19:59:00 +02:00
markus
0a15634550
Streams with CodecType "data" (like "epg" streams in DVB
...
recordings) get ignored. This results in wrong stream specifiers for all
subsequent streams. This fix correctly handles "data" streams without any
further processing.
2022-10-01 08:53:54 -06:00
Hannes Braun
4edeccc5e0
Remove redundant using directives
2022-09-28 16:26:03 +02:00
Cody Robibero
3716077495
Backport pull request #8433 from jellyfin/release-10.8.z
...
Update to dotnet 6.0.9
Original-merge: 4ec82ec662
Merged-by: Joshua M. Boniface <joshua@boniface.me>
Backported-by: Joshua M. Boniface <joshua@boniface.me>
2022-09-23 23:12:50 -04:00
1hitsong
d9be3874ba
Auto stash before merge of "lyric-lrc-file-support" and "origin/lyric-lrc-file-support"
2022-09-15 19:45:26 -04:00
1hitsong
9d5cf67dfe
Create ILyricsProvider
2022-09-11 15:50:27 -04:00
Cody Robibero
871ae39c9f
Merge pull request #8325 from nielsvanvelzen/uuid-userconfiguration
2022-09-05 08:52:24 -06:00
Niels van Velzen
dd4af49962
Use Guid type for UserConfiguration fields
2022-08-27 14:19:47 +02:00
Bond-009
e1e4ac75e4
Merge pull request #8267 from luzpaz/typos
2022-08-22 17:50:42 +02:00
Bond-009
c45c8bdec7
Merge pull request #7903 from knackebrot/ignore-dts
2022-08-22 17:49:27 +02:00
Negulici-R. Barnabas
1e41636e30
Merge branch 'jellyfin:master' into master
2022-08-22 07:19:39 +03:00
Niels van Velzen
de98457332
Fix operation name in SearchController and correct nullability for SearchHint
2022-08-18 17:44:40 +02:00
knackebrot
c3405d25fd
Make IgnoreDts configurable for M3U tuner
2022-08-18 01:08:03 +02:00
luz paz
9ec2870b10
Fix various typos
...
Found via `codespell -q 3 -S ./Emby.Server.Implementations/Localization -L allready,doesnt,inh,receivedfrom,whoknows`
2022-08-15 06:48:34 -04:00
Niels van Velzen
bef4256d47
Use guid for seriesId API parameter
2022-08-14 13:03:48 +02:00
Negulici-R. Barnabas
5196f63d43
Merge branch 'jellyfin:master' into master
2022-08-14 08:15:01 +03:00
SenorSmartyPants
de9a350bad
Backport pull request #8212 from jellyfin/release-10.8.z
...
Add resolution text for 384 sized video
Original-merge: 7ffdde9a0b
Merged-by: Cody Robibero <cody@robibe.ro>
Backported-by: Joshua Boniface <joshua@boniface.me>
2022-08-13 21:46:34 -04:00
adrez99
b8afdd892a
Merge branch 'master' into gzip
2022-08-04 17:22:35 +02:00
Shadowghost
59a86568d9
Cleanup and fixes
2022-07-21 22:09:54 +02:00
Negulici-R. Barnabas
5121baa9e8
Merge branch 'jellyfin:master' into master
2022-07-21 16:41:30 +03:00
Shadowghost
f6e41269d9
Enforce interface bindings on SSDP, add Loopback to LAN if no LAN defined
2022-07-21 09:26:18 +02:00
Joshua Boniface
924b0740b1
Backport pull request #8104 from jellyfin/release-10.8.z
...
Add resolution text output for more resolutions
Authored-by: Shadowghost <Ghost_of_Stone@web.de>
Merged-by: Bond-009 <bond.009@outlook.com>
Original-merge: 2b46917dcf
2022-07-20 19:29:08 -04:00
Negulici-R. Barnabas
12ec0e285d
Chapter Images:
...
- chapter image extraction intervals, limit count and resolutions can be set by the user from the server general settings;
2022-07-18 17:50:52 +03:00
Cody Robibero
40d3d8fb37
bump Jellyfin to 10.9
2022-07-13 21:00:56 -06:00
Mikal Stordal
8e1796f08a
Add escape hatch for Series merging
...
This is an universal solution for plugins to override how series are merged.
The reason to override is so we can set the same provider id on multiple items without merging them, while using another id for merging them. Having an (optional) provider id not tied to any online database allows plugins to use their own rules for merging series.
2022-07-03 00:32:09 +02:00
adrez99
aadd8ee971
Merge branch 'master' into gzip
2022-06-30 17:24:40 +02:00
Joshua M. Boniface
3061446c87
Merge pull request #7984 from crobibero/dotnet-6.0.6
...
Upgrade to dotnet 6.0.6, update remaining dependencies
(cherry picked from commit 56e7b323de
)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:36 -04:00
Joshua M. Boniface
fe32b5e333
Merge pull request #7964 from jellyfin/dovi-side-data
...
(cherry picked from commit 39d185c7b1
)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:15 -04:00
Joshua M. Boniface
e61c80fed7
Merge pull request #7960 from Shadowghost/subrip-encoder-fix
...
(cherry picked from commit ae79bbc34c
)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:15 -04:00
Cody Robibero
a65397ae14
Merge pull request #7950 from nyanmisaka/brighter-vpp-tonemap
...
(cherry picked from commit b36543275f
)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:15 -04:00
Cody Robibero
38102499cb
Merge pull request #7947 from nyanmisaka/video-range-condition
...
(cherry picked from commit f1d56aa5ce
)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:14 -04:00
Cody Robibero
5b0af106c2
Merge pull request #7940 from Shadowghost/fix-recommendations
...
(cherry picked from commit 6749313249
)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:14 -04:00
adrez99
72893da4d8
Use System.IO.Compression instead of SharpCompress for gzips
2022-06-19 00:06:40 +02:00
Cody Robibero
bee13d5644
Fix splashscreen ( #7895 )
2022-06-14 19:34:29 -04:00
Claus Vium
8d1dcb3c05
Merge pull request #7885 from iwalton3/fix-navigation-buttons
...
Prevent 400 error when using navigation buttons.
(cherry picked from commit 8b69b0f521
)
Signed-off-by: crobibero <cody@robibe.ro>
2022-06-14 19:30:59 -04:00
Cody Robibero
bacb41e142
Merge pull request #7854 from cvium/enable_mkv_keyframe_extraction
...
(cherry picked from commit 2a89683e80
)
Signed-off-by: crobibero <cody@robibe.ro>
2022-06-10 23:43:18 -04:00
Bond-009
c19c787273
Merge pull request #7828 from nyanmisaka/fix-dovi-tonemap
...
Fix Dolby Vision profile 5 and 8 to SDR HW tone-mapping
(cherry picked from commit 8595a979a8
)
Signed-off-by: crobibero <cody@robibe.ro>
2022-06-10 23:43:17 -04:00
Cody Robibero
b8722d02a3
Merge pull request #7781 from crobibero/live-tv-infinite
...
(cherry picked from commit 77c73e241f
)
Signed-off-by: crobibero <cody@robibe.ro>
2022-06-06 09:16:11 -04:00
Joshua M. Boniface
bc1a78575a
Merge pull request #7766 from crobibero/dotnet-6.0.5
...
(cherry picked from commit 71bf567045
)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-05-20 23:00:15 -04:00
Joshua M. Boniface
1b020b8abb
Merge pull request #7749 from cvium/disable_auto_add_collection
...
(cherry picked from commit 8119e4a573
)
Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20 18:32:47 -04:00
Joshua M. Boniface
47d150565d
Merge pull request #7712 from jellyfin/fix-hevc-disable-option
...
(cherry picked from commit 5a9e5e0d5d
)
Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20 18:30:57 -04:00
Joshua M. Boniface
2d8f7b46f1
Merge pull request #7699 from Shadowghost/streambuilder-fix
...
(cherry picked from commit b46d61dfdf
)
Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20 18:30:57 -04:00