alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-14 08:32:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
19,581 Commits 26 Branches 103 Tags
e8148ec0bd2a1bed1df7b4a3ba7a1cbed80c84bb
Commit Graph

529 Commits

Author SHA1 Message Date
Claus Vium
3fbe10364b Merge pull request #5444 from Ullmie02/hdhr-fix 
(cherry picked from commit 329edd9dbe)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2021-03-21 19:08:27 -04:00
Joshua M. Boniface
a10eea41ac Merge pull request #5402 from Ullmie02/fix-null-size 
Use FileShare.None when creating files

(cherry picked from commit 480dd66428)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2021-03-08 18:08:25 -05:00
Bond-009
ef864e24b9 Merge pull request #5301 from Bond-009/validinput 
(cherry picked from commit 5860979500)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2021-02-26 21:01:50 -05:00
Claus Vium
0d9e8b4f00 Merge pull request #4852 from ryanpetris/fix-schedulesdirect-refresh 
SchedulesDirect no longer refreshes channels properly

(cherry picked from commit e36881f4fd)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-30 18:55:51 -05:00
Claus Vium
13d62c5977 Merge pull request #4741 from jellyfin/tests8 
Add tests for HdHomerunHost.GetLineup

(cherry picked from commit 31e8273795)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Claus Vium
9799b6ae81 Merge pull request #4738 from jellyfin/tests8 
Add tests for HdHomerunHost.GetModelInfo

(cherry picked from commit e6650651b3)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Claus Vium
c1dd8f2050 Merge pull request #4737 from crobibero/missing-ensure-success 
(cherry picked from commit f322866127)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Anthony Lavado
126753a1fe Merge pull request #4735 from crobibero/json-recursion 
Fix JsonConverter recursion

(cherry picked from commit 94d805d03d)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Claus Vium
aae90a8480 Merge pull request #4730 from crobibero/base-item-dto-guid-nullable 
Don't serialize empty GUID to null

(cherry picked from commit b6ecaccf92)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Claus Vium
2e5333c1d4 Merge pull request #4715 from crobibero/hdhr-json-bool 
Add number to bool json converter

(cherry picked from commit 0aad17554c)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Bond_009
e4fd61411f Minor improvements 2020-12-02 15:38:52 +01:00
Claus Vium
0a35f35311 Merge pull request #4591 from jellyfin/schedulesdirect 
Clean up SchedulesDirect
 2020-11-30 19:58:20 +01:00
Joshua M. Boniface
9169a28df1 Merge pull request #4588 from jellyfin/hex 
Remove Hex class as the BCL has one now
 2020-11-27 01:59:58 -05:00
Bond_009
81ca6cb47c Clean up SchedulesDirect 2020-11-26 21:54:14 +01:00
Bond_009
38932fc7d1 Schedules Direct requires the hex to be lowercase 2020-11-26 13:21:04 +01:00
Bond_009
8c8a71692e Remove Hex class as the BCL has one now 2020-11-25 23:40:31 +01:00
crobibero
0acea5b077 Don't throw null reference if ContentType is null. 2020-11-24 16:42:27 -07:00
Joshua M. Boniface
2c9e355e42 Merge branch 'master' into NetworkPR2 2020-11-21 23:28:15 -05:00
Joshua M. Boniface
d5eb7e786f Merge pull request #4182 from ryanpetris/fix-hdhomerun 
Fix HD Home Run streaming
 2020-11-21 17:22:19 -05:00
BaronGreenback
8f25eaeb9d Update Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 16:02:54 +00:00
Greenback
616caca2b7 Added more comments. 2020-11-21 13:27:27 +00:00
BaronGreenback
7a6063ed41 Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
Fernando Fernández
e21e00cad5 Merge remote-tracking branch 'upstream/master' into no-scaling 2020-11-19 23:18:25 +01:00
Greenback
a3e47f3e4e Updated to latest Unstable. 2020-11-19 18:27:18 +00:00
Greenback
e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
Fernando Fernández
38c3b6fcd3 Fix build and thread detection logic 2020-11-18 10:20:59 +01:00
Bond_009
4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
Fernando Fernández
94cae4f145 Specify threads to ffmpeg properly 2020-11-17 16:44:04 +01:00
BaronGreenback
d66f88672c Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
Ryan Petris
8204b25a56 Merge branch 'master' into fix-hdhomerun 2020-11-15 19:55:30 -07:00
Ryan Petris
81d5eb4db5 Return a Task object and discard it instead of using async void. 2020-11-15 19:44:11 -07:00
crobibero
e66d79fc0c Merge remote-tracking branch 'upstream/master' into http-exception 2020-11-15 13:09:05 -07:00
crobibero
95a2de757f remove custom HttpException 2020-11-14 14:30:34 -07:00
Bond_009
c4bb32f259 Access last element by index where possible 2020-11-14 20:28:14 +01:00
Bond_009
bc7359f87d Use string.Split(char) where possible instead of string.Split(char[]) 2020-11-14 20:27:48 +01:00
crobibero
73f9a6d7d0 Convert array property to IReadOnlyList 2020-11-12 08:29:42 -07:00
Neil Burrows
e9d35cb2ca Switching to the more efficient Hex.Encode function 2020-11-08 17:16:51 +00:00
Neil Burrows
866c41519f Perform hashing of Password for Schedules Direct on server 2020-11-08 12:34:35 +00:00
Bond-009
082705c0d8 Merge pull request #4410 from crobibero/m3u-user-agent 
Set UserAgent when getting M3u playlist
 2020-11-06 16:28:50 +01:00
BaronGreenback
ec245dce90 Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
crobibero
b4d52d8009 Apply patch 2020-11-03 16:38:47 -07:00
crobibero
5d88e61076 Merge remote-tracking branch 'upstream/master' into livetv-ts-fix 2020-11-03 07:05:58 -07:00
Anthony Lavado
6205fb4b6a Merge pull request #4341 from Bond-009/minor6 
Minor improvements
 2020-11-02 11:10:39 -05:00
crobibero
6763d456ff Set UserAgent when getting M3u playlist 2020-11-01 19:23:28 -07:00
Greenback
83af636c61 Updated with new NetManager 2020-10-31 18:21:46 +00:00
crobibero
0c674b496f Add stream disposal comment. 2020-10-29 13:58:47 -06:00
crobibero
3568c5f39b Fix early filestream close 2020-10-29 13:56:29 -06:00
BaronGreenback
0b5ddc90ff Merge branch 'master' into NetworkPR2 2020-10-26 13:21:48 +00:00
Bond_009
49569ca0a0 Use nameof where possible 2020-10-17 16:19:57 +02:00
Jan-Pieter Baert
6f9beef732 Fix SA1012 and SA1013 warnings 2020-10-12 19:22:33 +02:00