Commit Graph

17862 Commits

Author SHA1 Message Date
Bill Thornton
2fa2952791 Skip image processing for live tv sources 2020-07-21 16:40:38 -04:00
David
cbf5c682e9 Change enum values 2020-07-21 22:06:07 +02:00
David
be8cf1e9ef Merge branch 'api-migration' into api-syncplay
# Conflicts:
#	MediaBrowser.Api/SyncPlay/SyncPlayService.cs
2020-07-21 21:56:24 +02:00
crobibero
6602b0dfb6 Move ImageService.cs to Jellyfin.Api 2020-07-21 13:17:08 -06:00
Patrick Barron
0c5ac10a68 Make IncrementInvalidLoginAttemptCount async. 2020-07-21 14:27:09 -04:00
crobibero
9787b2fe8a Detach tracked entries on dispose 2020-07-21 10:19:53 -06:00
crobibero
6c076b2162 Try adding plugin repository again 2020-07-21 08:27:12 -06:00
crobibero
230c54721d update post profile image 2020-07-21 08:05:21 -06:00
crobibero
b040d89e5c Merge remote-tracking branch 'upstream/api-migration' into api-image-service 2020-07-21 08:03:09 -06:00
David
5b57c81ee1
Merge pull request #3629 from crobibero/api-migration-merge
Api migration merge
2020-07-21 10:32:05 +02:00
Nyanmisaka
d4c6415f99
minor changes 2020-07-21 11:41:28 +08:00
crobibero
05f743480d fully remove jquery 2020-07-20 17:31:20 -06:00
crobibero
f4cafc2f31 fix built in plugin js 2020-07-20 17:23:36 -06:00
crobibero
5c66f9e471 changes from merge 2020-07-20 14:43:54 -06:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
Bond-009
0750357916
Merge pull request #3620 from BaronGreenback/IPFix
Fix for #3607 and #3515
2020-07-20 18:41:01 +02:00
Bond-009
61a602adb6
Merge pull request #3598 from barronpm/providermanager-cleanup
Clean up ProviderManager.cs
2020-07-20 18:19:09 +02:00
BaronGreenback
f983ea95d1
Update Emby.Server.Implementations/Networking/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-20 17:18:50 +01:00
BaronGreenback
bde1a38a88 Two fixes 2020-07-20 16:59:04 +01:00
dkanada
107cf21f26
Merge pull request #3616 from crobibero/migration-new-install
Allow migration to optionally run on fresh install
2020-07-20 23:38:28 +09:00
crobibero
9343e73b26 Allow migration to optionally run on fresh install 2020-07-20 07:45:24 -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
41c4cfe0af
Merge pull request #3604 from joshuaboniface/fix-bad-deps
Fix bad Debuntu dependencies
2020-07-20 14:20:57 +02:00
Bond_009
e98351b912 Replace \d with [0-9] in ffmpeg detection and scan code 2020-07-20 14:14:15 +02:00
Bond-009
8f11e057a2
Merge pull request #3602 from crobibero/user-change-case
Fix username case change
2020-07-20 11:47:47 +02:00
Bond_009
7324b44c43 Fix warnings 2020-07-20 11:01:37 +02:00
Joshua M. Boniface
b1fe20aac5 Readd sed'd out dotnet-sdk dependency 2020-07-19 23:36:48 -04:00
Joshua M. Boniface
4966ca3616 Remove the old Emby conflicts
It's been long enough that this is no longer an issue. We still conflict
on the ports 8096 and 8190, but this will simply result in a failure to
start; allow users to get themselves into that situation if they wish.
2020-07-19 23:28:25 -04:00
Joshua M. Boniface
4ecedb2a12 Fix bad dependency handling in 10.6.0-1
Fixes the incorrect dependency handling from 10.6.0, which was missing
the Replaces and Breaks entries on jellyfin-server. Thus apt would
complain about /etc/default/jellyfin being in two packages and fail to
upgrade. With this configuration, I've verified that apt now handles
this situation properly.
2020-07-19 23:26:59 -04:00
Patrick Barron
6e11f77922 Add missing documentation. 2020-07-19 22:30:25 -04:00
crobibero
d1e351a00a Fix username case change 2020-07-19 20:21:30 -06:00
Patrick Barron
3fdbdf4078 Clean up ProviderManager.cs 2020-07-19 20:54:57 -04:00
Patrick Barron
36b05157f0 Rewrite CropWhitespace 2020-07-19 18:06:12 -04:00
Patrick Barron
4a356efa2c Make constructor one line 2020-07-19 17:59:54 -04:00
Patrick Barron
b51a10948a Rewrite OrientImage 2020-07-19 17:59:33 -04:00
Bond-009
c8539709ac
Merge pull request #3596 from joshuaboniface/fix-typo
Fix typo in CI configuration
2020-07-19 23:57:46 +02:00
Joshua M. Boniface
2f2fe3552d Fix typo in CI configuration 2020-07-19 17:54:46 -04:00
BaronGreenback
301ddc1dac
Update HttpContextExtensions.cs 2020-07-19 22:19:17 +01:00
Joshua M. Boniface
677ec1b27a
Merge pull request #3575 from jellyfin/ffmpeg-depends
Bump the minimun required jellyfin-ffmpeg version
2020-07-19 17:16:08 -04:00
Joshua M. Boniface
a5b673d542 Revert "bump the minimum required jellyfin-ffmpeg ver to 4.3.1-1"
This reverts commit d3fa6b428a.

Don't change this, since 4.3.1 won't build on Stretch but we still want
to support it.
2020-07-19 17:06:58 -04: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
Bond_009
65453c0a84 Fix build and more Append calls 2020-07-19 21:32:54 +02:00
Bond_009
39be99504f Improve DescriptionXmlBuilder
* Replace XML escape code with SecurityElement.Escape
* Optimize StringBuilder.Append calls
2020-07-19 21:20:18 +02:00
Patrick Barron
2569793ff0 Reuse paint objects. 2020-07-19 14:39:11 -04:00
Patrick Barron
d983d65d8a Simplify return statements 2020-07-19 14:18:23 -04:00
Joshua M. Boniface
050c6cdaa4
Merge pull request #3593 from joshuaboniface/nuget-publish
Add NuGet publish step to tag CI
2020-07-19 14:17:11 -04:00
Patrick Barron
a9806d8f4a Convert to switch expressions 2020-07-19 14:16:33 -04:00
Patrick Barron
1be3e1e037 Remove unnecessary base constructor calls. 2020-07-19 14:14:44 -04:00
Patrick Barron
87b8a8d7c7 Simplify arithmetic 2020-07-19 14:13:56 -04:00
Patrick Barron
bd77f1e84f Remove redundant casts 2020-07-19 14:13:18 -04:00