Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-08-11 09:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
21,197 Commits 19 Branches 91 Tags
Commit Graph

2607 Commits

Author SHA1 Message Date
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
nyanmisaka
d7caf88df6 expose max_muxing_queue_size to user 2020-08-25 02:20:46 +08:00
crobibero
9626101c9f Merge remote-tracking branch 'upstream/master' into 3.1.7 2020-08-24 07:39:16 -06:00
crobibero
07e7125d07 Fix dlna play to 2020-08-21 07:24:44 -06:00
nyanmisaka
dd3b48f203 fix lint 2020-08-20 15:17:42 +08:00
Patrick Barron
98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
nyanmisaka
aa75755480 Merge remote-tracking branch 'upstream/master' into fonts 2020-08-19 16:56:53 +08:00
crobibero
b43a8fb9d3 Merge remote-tracking branch 'upstream/master' into package-install-repo 2020-08-18 20:20:32 -06:00
Mygod
8b9a380466
Add 1440p to the mix 
Partially addresses #3112.
 2020-08-18 01:24:24 -04:00
Matt Montgomery
5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
Patrick Barron
ca1f15af19 Move GenericEventArgs to Jellyfin.Data.Events 2020-08-13 20:52:55 -04:00
Patrick Barron
3ee940f7b3 Clean up GenericEventArgs 2020-08-13 19:14:03 -04:00
Patrick Barron
27139709e5 Remove ListHelper.cs 2020-08-13 17:05:55 -04:00
David
b92fbe4d69 Use VersionPrefix 2020-08-13 19:03:24 +02: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
Orry Verducci
2d6699fd47 Merge remote-tracking branch 'upstream/master' into deinterlace-improvements 2020-08-10 22:17:13 +01:00
Orry Verducci
7df2affb23 Add double rate deinterlacing option 2020-08-10 22:14:47 +01:00
Bond_009
593dbcabff Fix docs 2020-08-09 14:08:56 +02:00
Bond_009
4a4dff1973 Fix 2020-08-09 14:08:56 +02:00
crobibero
e65ecb5687 Merge remote-tracking branch 'upstream/master' into api-merge-again 2020-08-04 20:29:06 -06:00
Bond_009
2b355c36ff Minor improvements 
OFC I reduced some allocations
 2020-08-03 20:32:45 +02: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
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
45a97056ea allows to provide multiple fonts 2020-07-29 02:44:11 +08:00
Matt Montgomery
a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05:00
nyanmisaka
7b862bba5a add Tonemapping relaying on nvdec and ocl 2020-07-25 00:57:34 +08:00
nyanmisaka
c888b34a62 add a method to use custom fallback fonts for subtitle rendering 2020-07-24 21:19:56 +08:00
Patrick Barron
a59bc5c6a8 Fixed compilation error. 2020-07-23 20:57:59 -04:00
Patrick Barron
3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Pika
7331c02a21
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:22:56 -04:00
Pika
ea4aa5ed8e
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:13:19 -04:00
Pika
262daa6650
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:13:02 -04:00
Pika
f5a3408c89
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:12:52 -04:00
Pika
3b21abd879
Merge branch 'master' into more-track-titles 2020-07-23 18:59:25 -04: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
Bond-009
944fdb4c62
Merge pull request #3552 from BaronGreenback/NotificationFix 
Fixes #3551 (Notifications Serialization error)
 2020-07-23 10:34:32 +02:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06: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
BaronGreenback
6b4cea604c Suggested changes and removed some intellisense messages. 2020-07-17 16:19:06 +01:00
crobibero
2b5d515de7 specify plugin repo on install 2020-07-17 09:08:29 -06:00
David
262e19b691 Add X-Response-Time-ms header and log slow server response time 2020-07-14 13:40:18 +02:00
BaronGreenback
12478c7196
Update NotificationOption.cs 
Fixes serialisation bug
 2020-07-13 17:54:06 +01:00
dkanada
5e706ba7ce keep playstate during syncplay group creation 2020-07-13 06:55:03 +09:00
David
ee03b919f9 Fix parsing 2020-07-12 20:11:59 +02:00
Joshua M. Boniface
f3151e7dc7
Merge pull request #3505 from Bond-009/minor3 
Minor fixes
 2020-07-05 00:30:35 -04:00