Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-21 22:40:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,984 Commits 15 Branches 89 Tags
Commit Graph

926 Commits

Author SHA1 Message Date
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
Joshua M. Boniface
cf6ef9958d
Merge pull request #3910 from barronpm/event-rewrite-1 
Event Rewrite (Part 1)
 2020-08-25 16:59:35 -04:00
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Patrick Barron
fa8892fde4 Make LibraryController.GetDownload async 2020-08-24 20:27:10 -04:00
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
nyanmisaka
6462ca0036 increase the max muxing queue size for ffmpeg 2020-08-24 22:54:14 +08:00
crobibero
cb44f16068 Merge remote-tracking branch 'upstream/master' into output-formatters 2020-08-23 07:53:33 -06:00
Bond-009
92c491397e
Merge pull request #3941 from crobibero/no-more-form 
Conver all remaining form request to body
 2020-08-22 13:06:12 +02:00
Joshua M. Boniface
3e65cae70e
Merge pull request #3955 from Bond-009/async3 
Make some methods async
 2020-08-21 18:03:07 -04:00
Bond_009
4916bfb024 Address comment 2020-08-21 22:59:47 +02:00
Bond_009
2b832de289 Fix build 2020-08-21 22:19:16 +02:00
Bond_009
6329a36a27 Make method async 2020-08-21 22:06:06 +02:00
Bond_009
119f64f5e7 Make some methods async 2020-08-21 22:01:19 +02:00
crobibero
4a64819277 Fix dlna produces type 2020-08-21 11:10:29 -06:00
crobibero
07e7125d07 Fix dlna play to 2020-08-21 07:24:44 -06:00
Bond_009
170e434f92 Fix all warnings in Emby.Dlna 2020-08-20 21:04:57 +02:00
Nyanmisaka
05e78ee78c
Apply suggestions from code review 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-08-20 22:53:36 +08:00
crobibero
d63f4bce5d Conver all remaining form request to body 2020-08-20 07:53:53 -06:00
Bond-009
250e351613
Merge pull request #3938 from crobibero/fix-audio-routes 
Fix conflicting audio routes
 2020-08-20 10:52:28 +02: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
crobibero
11e3cdb3cb Fix conflicting audio routes 2020-08-19 15:08:28 -06:00
Nyanmisaka
16658c92fe
fix SubtitlesOctopus 2020-08-20 00:08:44 +08:00
Nyanmisaka
53861db451
Apply suggestions from code review 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-08-20 00:04:55 +08:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
Anthony Lavado
634ee2d1e9
Merge pull request #3861 from crobibero/fixes 
API Fixes
 2020-08-19 08:17:03 -04:00
nyanmisaka
988e76d4c7 update endpoints as AspNet controllers 2020-08-19 17:30:22 +08:00
crobibero
50a9c8c8a7 resolve merge conflicts 2020-08-18 20:22:15 -06:00
crobibero
b90e240af6 rename clientCapabilities 2020-08-18 07:29:39 -06:00
crobibero
287baa4965 remove unused directives 2020-08-18 07:29:12 -06:00
Matt Montgomery
1ff4f8e6c6 Get userId from claim 2020-08-17 18:55:16 -05:00
Matt Montgomery
5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
crobibero
4ec1341c8f Fix conflicts 2020-08-17 15:54:51 -06:00
crobibero
29d8e38161 Merge remote-tracking branch 'upstream/master' into fixes 2020-08-17 15:54:40 -06:00
crobibero
be67528958 add disposal docs 2020-08-17 15:03:45 -06:00
crobibero
3a91047413 P E R F O R M A N C E 2020-08-17 14:59:00 -06:00
crobibero
9c6b4f033a revert lastordefault 2020-08-17 14:55:14 -06:00
crobibero
898ccab222 oop 2020-08-17 13:41:16 -06:00
crobibero
767c73e5c1 fix usings 2020-08-17 13:22:42 -06:00
crobibero
1325815182 Remove IHttpClient from Providers 2020-08-17 13:10:02 -06:00
Bond-009
d0f49b3994
Merge pull request #3895 from crobibero/httpclient 
Remove IHttpClient from Jellyfin.Api
 2020-08-17 10:47:45 +02:00
Matt Montgomery
c49a357f85 Fix compile errors 2020-08-16 17:45:53 -05:00
ConfusedPolarBear
eaa5711534
Apply suggestions from code review 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-08-16 17:21:08 -05:00
Matt Montgomery
035d29fb35 Migrate to new API standard 2020-08-16 14:45:39 -05:00
crobibero
7861c72754 Revert "Fix audio stream routes" 
This reverts commit 0c50015400c63d68513184c58b25fb19d5b600fe.
 2020-08-16 11:47:26 -06:00
crobibero
0c50015400 Fix audio stream routes 2020-08-16 11:34:41 -06:00
crobibero
8da646e12b Dispose httpclient response 2020-08-16 10:57:01 -06:00
crobibero
3c395814fd fix dlna routes again 2020-08-16 10:53:57 -06:00
crobibero
8ddcd12348 Remove all using for HttpClient 2020-08-16 09:47:08 -06:00