michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,113 Commits 2 Branches 79 Tags 73 MiB
583e4ef97f
Commit Graph

17113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Joshua M. Boniface
dfd00c7b24 Add NuGet publish step to tag CI 2020-07-19 14:01:32 -04:00
Anthony Lavado
6ab4493ecb
Merge pull request #3591 from crobibero/clear-existing-image 
Remove profile image before setting new
 2020-07-19 11:21:08 -04:00
Bond-009
7ad08953c0
Merge pull request #3590 from crobibero/tvdb-actors 
Fix tvdb actors url
 2020-07-19 17:16:49 +02:00
Bond-009
ce07e45897
Merge pull request #3585 from Ken-g6/2354-soft-link-sizes 
2354 fix soft link sizes
 2020-07-19 17:16:13 +02:00
crobibero
59365150d8 Remove profile image before setting new 2020-07-19 08:31:35 -06:00
crobibero
8a778c08d2 Fix tvdb actors url 2020-07-19 08:21:26 -06:00
Anthony Lavado
8ac08499bc
Merge pull request #3587 from crobibero/user-update-policy 
fix UserManager UpdatePolicy
 2020-07-18 23:04:14 -04:00
crobibero
2f38d9700c fix UserManager UpdatePolicy 2020-07-18 20:29:27 -06:00
Ken
eea142cad1
FullName property instead of ToString in Emby.Server.Implementations/IO/ManagedFileSystem.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-18 19:40:28 -06:00
Ken
d719ca78b4
Spacing standard on Emby.Server.Implementations/IO/ManagedFileSystem.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-18 19:39:31 -06:00
Anthony Lavado
6e1735d311
Merge pull request #3586 from barronpm/remove-networkpath 
Remove obsolete network path code
 2020-07-18 20:40:37 -04:00
Anthony Lavado
8782c19068
Merge pull request #3582 from barronpm/update-dotnet 
Update .NET Core to 3.1.6
 2020-07-18 19:40:46 -04:00
Anthony Lavado
f9d4b0a2d7
Merge pull request #3579 from crobibero/activity-log-userid 
Add UserId filter to ActivityLog Entries endpoint
 2020-07-18 19:40:30 -04:00
Patrick Barron
b53bf2cd16 Remove obsolete network path code 2020-07-18 16:21:01 -04:00
Ken Brazier
6a39b1a4ca Merge 'master' updates into 2354-soft-link-sizes 2020-07-18 11:39:53 -06:00