Commit Graph

17130 Commits

Author SHA1 Message Date
David Ullmer
4aa0bd064f Move HlsSegmentService to Jellyfin.Api 2020-07-27 09:47:19 +02:00
Patrick Barron
6015ceb731
Merge pull request #3693 from crobibero/api-library
Fix LibraryStructure API parameters
2020-07-26 16:09:31 +00:00
crobibero
259b5d7f0a Fix request parameters 2020-07-24 17:46:17 -06:00
crobibero
5924a81eeb Fix request parameters 2020-07-24 17:31:11 -06:00
crobibero
d801621cfc Fix request parameters 2020-07-24 17:22:32 -06:00
Patrick Barron
44acb9f7d9
Merge pull request #3592 from Ullmie02/api-audio
Migrate AudioService to Jellyfin.Api
2020-07-24 20:53:06 +00:00
David
ca3dcc3db0 Fix suggestions from review 2020-07-24 19:14:53 +02:00
Patrick Barron
583e4ef97f
Merge pull request #3385 from crobibero/api-image-service
Move ImageService.cs to Jellyfin.Api
2020-07-24 00:35:34 +00:00
David
d39f481a5c Apply suggestions from review 2020-07-23 12:46:54 +02:00
Bond-009
ab9c1295ce
Merge pull request #3538 from Ullmie02/api-fix
Fix value parsing in Jellyfin.Api
2020-07-23 10:37:30 +02:00
David
cff9772e14 Fix build part 2 2020-07-22 20:13:51 +02:00
David
1cb20f9181 Fix build 2020-07-22 19:44:17 +02:00
Patrick Barron
968922e920
Merge pull request #3564 from Ullmie02/api-syncplay
Move SyncPlay api to Jellyfin.Api
2020-07-22 16:18:53 +00:00
David
2ce97c022e Move AudioService to Jellyfin.Api 2020-07-22 16:57:06 +02:00
David
69e6dd2747
Update Jellyfin.Api/Controllers/SyncPlayController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-22 16:53:56 +02:00
David
15ac8095b4
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-07-22 16:49:52 +02:00
crobibero
b006fd1b8f apply review suggestions 2020-07-22 08:03:45 -06:00
David
5580df38e6 Cleanup after merge 2020-07-22 11:05:41 +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
David
eae665a9c4 Add properties to StreamState to fix some errors 2020-07-22 10:57:27 +02:00
David
07e56850be Remove caching and content length 2020-07-22 10:39:48 +02:00
David
9996afbf25 Add response code documentation 2020-07-22 10:20:51 +02: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
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
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
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
8f11e057a2
Merge pull request #3602 from crobibero/user-change-case
Fix username case change
2020-07-20 11:47:47 +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
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
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
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