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

722 Commits

Author SHA1 Message Date
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
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
David
c6a0306a34 Move field to the controller 2020-07-14 20:20:24 +02:00
David
9f567e6471 Don't recreate JsonSerializerOptions every time 2020-07-14 12:39:58 +02:00
David
ee03b919f9 Fix parsing 2020-07-12 20:11:59 +02:00
Patrick Barron
fe02c6e863
Merge pull request #2929 from crobibero/api-scheduled-tasks 
Scheduled Tasks to Jellyfin.Api
 2020-06-25 23:46:03 +00:00
dkanada
4e08876028
Merge pull request #3418 from Bond-009/minor3 
Minor changes
 2020-06-23 16:56:44 +09:00
Bond-009
3d42f37538 Minor changes 2020-06-22 15:35:53 +02:00
Bond-009
464066f362
Merge pull request #3411 from neilsb/system-plugin-removal 
Prevent system plugins from being uninstalled
 2020-06-22 15:23:35 +02:00
dkanada
552a358c9c
Merge pull request #3244 from jellyfin/custom-repos 
Initial implementation for custom plugin repositories
 2020-06-22 22:08:43 +09:00
Neil Burrows
0bab57ebbc Wrapping long line on function parameters (take 2) 2020-06-22 11:56:18 +01:00
Neil Burrows
966ebfaf68 Wrapping long line on function parameters 2020-06-22 11:53:15 +01:00
Neil Burrows
c20400fa40 Prevent system plugins from being uninstalled 2020-06-22 10:13:28 +01:00
Cody Robibero
43221fc26b
Merge branch 'master' into SSDP 2020-06-20 15:33:13 -06:00
David
6651cb8d24 Add JsonInto32Converter 
Add additional swagger type mapping
 2020-06-19 12:24:39 +02:00
dkanada
f5d82441a4
Merge branch 'master' into custom-repos 2020-06-17 02:09:32 +09:00
dkanada
6db1878011
Merge pull request #3315 from crobibero/dashboard-update 
Add MessageId to websocket message, fix ws exception
 2020-06-15 10:55:33 +09:00
crobibero
39376bace3 Merge remote-tracking branch 'upstream/api-migration' into api-scheduled-tasks 2020-06-13 15:06:07 -06:00
crobibero
ec3e15db57 Fix merge and build 2020-06-13 13:11:41 -06:00
crobibero
829eb1a849 merge master into api-migration 2020-06-13 13:03:09 -06:00
crobibero
5b6e8fb22c Remove whitespace 2020-06-12 06:53:47 -06:00
Cody Robibero
4c0dd10fb3
Update MediaBrowser.Common/Json/Converters/JsonNonStringKeyDictionaryConverter.cs 
Co-authored-by: aled <aled@wibblr.com>
 2020-06-11 16:21:53 -06:00
BaronGreenback
306f7b3c30
Update INetworkManager.cs 2020-06-11 23:10:13 +01:00
BaronGreenback
2cecde658b
Update INetworkManager.cs 
Editting comments - adding periods
 2020-06-11 22:58:29 +01:00
crobibero
30609c848b Add MessageId to websocket message, add JsonNonStringKeyDictionaryConverter 2020-06-11 10:51:47 -06:00
crobibero
a6815018dc Update to .NET Core 3.1.5 2020-06-11 07:13:56 -06:00
crobibero
6c53e36ccf Fix Api Routing 2020-06-04 15:17:05 -06:00
crobibero
a787efc660 Merge remote-tracking branch 'upstream/api-migration' into api-scheduled-tasks 2020-06-04 15:16:04 -06:00
dkanada
b7f4b8e2b5 initial implementation for custom plugin repositories 2020-06-04 23:57:57 +09:00
Vasily
21505377d5
Merge pull request #3236 from Bond-009/common 
Enable StyleCop for MediaBrowser.Common
 2020-06-04 11:56:41 +03:00
crobibero
8b59934ccb remove extra Clear call 2020-06-03 09:12:12 -06:00
Bond-009
f404e915ee Enable StyleCop for MediaBrowser.Common 2020-06-03 13:04:45 +02:00
crobibero
01a5103fef Add Dictionary with non-string keys to System.Text.Json 2020-06-02 11:47:33 -06:00
crobibero
4fe0beec16 Fix Json Enum conversion, map all JsonDefaults properties to API 2020-06-02 08:23:12 -06:00
dkanada
7972daaba4 fix a few issues with the plugin manifest 2020-05-24 15:40:27 +09:00
crobibero
341b947cde Move int64 converter to JsonDefaults location 2020-05-22 10:48:01 -06:00
BaronGreenback
d5a924772b
Update MediaBrowser.Common/Net/INetworkManager.cs 
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
 2020-05-17 20:44:35 +01:00
BaronGreenback
5e1be0d4f0
Update MediaBrowser.Common/Net/INetworkManager.cs 
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
 2020-05-17 20:44:19 +01:00
BaronGreenback
61e65d032e
Update MediaBrowser.Common/Net/INetworkManager.cs 
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
 2020-05-17 20:43:54 +01:00
Mark Monteiro
3ed76d7e08 Update to .NET Core 3.1.4 2020-05-17 13:33:38 -04:00
BaronGreenback
8a69300bf5 Changes styles as suggested by @barronpm 
Added addtional comments & source type as per intellisense suggestion
change code as per sonacloud
 2020-04-29 12:24:01 +01:00
Vasily
5922c35d69
Merge pull request #2920 from Bond-009/tests2 
Add some simple tests
 2020-04-29 12:17:01 +03:00
BaronGreenback
ebd589aa86 Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored. 
Fixing this required the removal of the code that attempted to detect virtual interfaces. Not wanting to remove functionality, but not able to keep the code in place, I implemented a work around solution (see 4 below).

Whilst in the area, I also fixed a few minor bugs i encountered (1, 5, 6 below) and stopped SSDP messages from going out on non-LAN interfaces (3)

All these changes are related.

Changes

1 IsInPrivateAddressSpace - improved subnet code checking
2 interfaces with no gateway were being excluded from SSDP blasts
3 filtered SSDP blasts from not LAN addresses as defined on the network page.
4 removed #986 mod - as this was part of the issue of #2986. Interfaces can be excluded from the LAN by putting the LAN address in brackets. eg. [10.1.1.1] will exclude an interface with ip address 10.1.1.1 from SSDP
5 fixed a problem where an invalid LAN address causing the SSDP to crash
6 corrected local link filter (FilterIPAddress) to filter on 169.254. addresses
 2020-04-28 21:57:39 +01:00
BaronGreenback
a3140f83c6 Revert "Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored." 
This reverts commit 2aaecb8e14.
 2020-04-28 21:51:49 +01:00
BaronGreenback
2aaecb8e14 Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored. 
Fixing this required the removal of the code that attempted to detect virtual interfaces. Not wanting to remove functionality, but not able to keep the code in place, I implemented a work around solution (see 4 below).

Whilst in the area, I also fixed a few minor bugs i encountered (1, 5, 6 below) and stopped SSDP messages from going out on non-LAN interfaces (3)

All these changes are related.

Changes

1 IsInPrivateAddressSpace - improved subnet code checking
2 interfaces with no gateway were being excluded from SSDP blasts
3 filtered SSDP blasts from not LAN addresses as defined on the network page.
4 removed #986 mod - as this was part of the issue of #2986. Interfaces can be excluded from the LAN by putting the LAN address in brackets. eg. [10.1.1.1] will exclude an interface with ip address 10.1.1.1 from SSDP
5 fixed a problem where an invalid LAN address causing the SSDP to crash
6 corrected local link filter (FilterIPAddress) to filter on 169.254. addresses
 2020-04-28 21:45:46 +01:00
Mark Monteiro
cbd62e00a4 Ensure transcoding path is created when it is retrieved 2020-04-26 15:07:37 -04:00
Bond_009
118f30059c Merge branch 'master' into nullable4 2020-04-23 11:29:19 +02:00
Mark Monteiro
8f02fb9a4f Remove unused usings 
This addresses the new issues identified in SonarCloud analysis
 2020-04-22 13:09:59 -04:00
Bond-009
d744d7d234 Merge branch 'master' into register-services-correctly 2020-04-22 13:05:03 -04:00