Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 13:57:20 -05:00
Code Issues Packages Projects Releases Wiki Activity
19,441 Commits 26 Branches 102 Tags
Commit Graph

337 Commits

Author SHA1 Message Date
Claus Vium
8138fc3003 Merge pull request #5095 from Bond-009/sortorder 
(cherry picked from commit 98a4e1b8402c37703344113e302167b5e2721d5f)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2021-02-21 13:29:02 -05:00
Joshua M. Boniface
cdba6b3d35 Merge pull request #5031 from crobibero/5.0.2 
Update to dotnet 5.0.2

(cherry picked from commit 3bf7e18886840307d56a304f1a2d28c95ce678d8)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2021-01-23 15:39:32 -05:00
Claus Vium
7796486511 Merge pull request #4978 from BaronGreenback/MultipeProxies 
(cherry picked from commit 14bd4a110f91f1f5e8d2412b3e125e39e2b79e51)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2021-01-23 15:37:25 -05:00
Joshua M. Boniface
81a17b803d Merge pull request #4970 from BaronGreenback/networkTestCorrection 
(cherry picked from commit fe9096be9466c3af6d51b1dcfcf96348a3478c53)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2021-01-23 15:37:25 -05:00
Joshua M. Boniface
4a2b143028 Merge pull request #4884 from crobibero/json-nullable-guid-converter 
Add JsonConverter for Nullable Guids

(cherry picked from commit 0de45d8724d15899f27b22d95be8102e293d7041)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-31 18:50:02 -05:00
Claus Vium
0d8fa795a0 Merge pull request #4753 from crobibero/5.0.1 
Update to dotnet 5.0.1

(cherry picked from commit a56ac654498298f2d67a5109f8112ba17ca9ee22)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Bond-009
ddedb2d7f1 Merge pull request #4749 from crobibero/guid-standard 
(cherry picked from commit 933e7fa159adb9486b7c34cda3efbaeaf0c164e4)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Claus Vium
13d62c5977 Merge pull request #4741 from jellyfin/tests8 
Add tests for HdHomerunHost.GetLineup

(cherry picked from commit 31e82737953700a53970e31010bc6c710be25872)
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 e6650651b3fd85bb359420c72eaf4335b89d0c2c)
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 94d805d03d93764365c5b63e23f239d47d23ad0a)
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 b6ecaccf92ae9ca9b0cc75e6dd666a896e72aa99)
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 0aad17554c737404aaf9492d4cb16eee2ccbd4e7)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
 2020-12-13 20:34:32 -05:00
Claus Vium
79578521b8
Merge pull request #4629 from crobibero/auth-handler 
Provide NoResult instead of Fail in CustomAuthenticationHandler
 2020-12-01 23:44:52 +01:00
Bond_009
f6a38e6340 Add tests for GetUuid 2020-12-01 15:12:55 +01:00
crobibero
38b3b4f867 Provide NoResult instead of Fail in CustomAuthenticationHandler 2020-12-01 06:32:46 -07:00
dependabot[bot]
44edd4b1a2
Bump Moq from 4.15.1 to 4.15.2 
Bumps [Moq](https://github.com/moq/moq4) from 4.15.1 to 4.15.2.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/commits/v4.15.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-30 12:01:00 +00:00
Bond_009
10be618ec3
Add more tests for JsonGuidConverter 2020-11-28 16:33:57 +01:00
Bond_009
8c8a71692e Remove Hex class as the BCL has one now 2020-11-25 23:40:31 +01:00
BaronGreenback
50e375020a
[Fix] NetworkManager binding to [::] (#4549) 
* Autodiscovery enable/disable patch

* Fixed [::] issue on bind. Altered test.

* Update UdpServerEntryPoint.cs

* Update Jellyfin.Networking.Tests.csproj

* Update Jellyfin.Networking.Tests.csproj

* Update INetworkManager.cs
 2020-11-24 06:11:02 +01:00
Joshua M. Boniface
2c9e355e42
Merge branch 'master' into NetworkPR2 2020-11-21 23:28:15 -05:00
Greenback
dc1ad3fe2a Better named tests methods. 2020-11-21 20:31:24 +00:00
BaronGreenback
1e13627a94
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:05:31 +00:00
BaronGreenback
3f2c331755
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:05:11 +00:00
BaronGreenback
c3fa9d00ae
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:04:58 +00:00
BaronGreenback
e33200db71
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:04:16 +00:00
BaronGreenback
c14f468099
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:04:02 +00:00
BaronGreenback
acb79eb56a
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:02:36 +00:00
BaronGreenback
b4e7032872
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:02:19 +00:00
BaronGreenback
13162184f4
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:01:58 +00:00
BaronGreenback
5ac25364db
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:01:01 +00:00
BaronGreenback
ac03516f89
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:00:37 +00:00
BaronGreenback
23fa9533af
Update tests/Jellyfin.Networking.Tests/NetworkTesting/NetworkParseTests.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 20:00:17 +00:00
Greenback
9b5ae690c1 renamed file. 2020-11-21 16:17:26 +00:00
Greenback
e41d1773ba changes 2020-11-21 16:14:03 +00:00
BaronGreenback
7403b9a9e5
Update tests/Jellyfin.Networking.Tests/NetworkTesting/UnitTesting.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 16:10:35 +00:00
BaronGreenback
46e6128f6c
Update tests/Jellyfin.Networking.Tests/NetworkTesting/UnitTesting.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 16:08:19 +00:00
BaronGreenback
56754a2af2
Update tests/Jellyfin.Networking.Tests/NetworkTesting/UnitTesting.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 16:03:25 +00:00
BaronGreenback
ead881d487
Update tests/Jellyfin.Networking.Tests/NetworkTesting/UnitTesting.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-11-21 16:03:16 +00:00
BaronGreenback
7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
crobibero
f512d5167d Remove broken CleanDateTimes regex 2020-11-20 11:27:37 -07:00
crobibero
5b8e248d72 Merge remote-tracking branch 'upstream/master' into video-resolver 2020-11-20 11:21:24 -07:00
Joshua M. Boniface
7457c4a95d
Merge pull request #4499 from crobibero/more-param 
Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids
 2020-11-20 12:34:18 -05:00
Greenback
a3e47f3e4e Updated to latest Unstable. 2020-11-19 18:27:18 +00:00
Anthony Lavado
28da945fe0
Merge pull request #4488 from jellyfin/dependabot/nuget/Moq-4.15.1 
Bump Moq from 4.14.7 to 4.15.1
 2020-11-17 11:52:06 -05:00
crobibero
3cc0dd7e12 Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids usage. 2020-11-16 20:29:46 -07:00
BaronGreenback
2bbfcc264d
Merge branch 'master' into emby-namig-nullable 2020-11-16 19:47:36 +00:00
Greenback
979de240cb Updated tests to .Net5 2020-11-16 17:30:27 +00:00
BaronGreenback
d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
dependabot[bot]
cfb7523ea8
Bump Moq from 4.14.7 to 4.15.1 
Bumps [Moq](https://github.com/moq/moq4) from 4.14.7 to 4.15.1.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-15 20:47:21 +00:00
crobibero
056c44010b Fix tests 2020-11-15 12:19:07 -07:00