Commit graph

476 commits

Author SHA1 Message Date
Joshua M. Boniface 22cc602117
Merge pull request #3366 from barronpm/remove-usermanager-addparts
Remove UserManager.AddParts
2020-07-23 18:05:57 -04:00
Patrick Barron 200f369596 Use interfaces in app host constructors 2020-07-22 19:34:14 -04:00
Patrick Barron 303c175714 Fix circular dependency 2020-07-13 17:25:50 -04:00
Patrick Barron 3b085f6a03 Remove UserManager.AddParts 2020-07-13 17:25:50 -04:00
Anthony Lavado 3d3e66c5d1
Merge pull request #3513 from barronpm/plugin-exception-fix
Fix TypeLoadException during plugin load
2020-07-05 13:55:24 -07:00
Patrick Barron 942c733d4f Fix TypeLoadException during plugin load 2020-07-05 15:38:35 -04:00
Bond_009 ae6eaa7f02 Minor fixes 2020-07-04 22:06:27 +02:00
Neil Burrows 4748df26b6 Remove un-needed comment 2020-06-29 17:25:12 +01:00
Neil Burrows 4389773508 Respect FFMpeg path passed via Environment Variable 2020-06-29 17:17:28 +01:00
Cody Robibero 43221fc26b
Merge branch 'master' into SSDP 2020-06-20 15:33:13 -06:00
telans 9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
crobibero 44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
Patrick Barron 01ce56016a Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
2020-05-26 20:29:11 -04:00
gion e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
Patrick Barron 3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Patrick Barron aca7e221d8 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15 17:20:07 -04:00
gion 029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Patrick Barron 953777f1ba Removed unnecessary usings 2020-05-14 18:12:51 -04:00
Patrick Barron 87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Patrick Barron b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
Mark Monteiro 2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Vasily f08830ea00
Merge pull request #2774 from mark-monteiro/simplify-https-config
Simplify HTTPS Properties
2020-05-13 20:36:54 +03:00
Patrick Barron b7621d762c 2nd half of changes 2020-05-13 00:00:57 -04:00
Patrick Barron 9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Patrick Barron 62420a6eb1 Remove support for injecting ILogger directly 2020-05-12 16:03:15 -04:00
Mark Monteiro 3abf870c1e Do not include a double slash in URLs when a base URL is not set 2020-05-10 18:07:56 -04:00
Mark Monteiro dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
Mark Monteiro 43c22a5822 Add GetLoopbackHttpApiUrl() helper method to replace forceHttps functionality
Also refactor to use return a Uri instead of a string and use UriBuilder under the hood
2020-05-10 14:36:11 -04:00
gion 8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
Patrick Barron 032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Bond_009 3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009 04f826e50c Fix merge errors 2020-05-02 01:09:35 +02:00
Bond_009 15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Bond-009 690fb65cd8
Merge pull request #2985 from sparky8251/prometheus
Add Prometheus exporters
2020-04-29 11:36:05 +02: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
gion 10c2c62f07 Implement syncplay backend 2020-04-27 22:07:33 +02:00
sparky8251 e3a42a8fe9 Address reviews 2020-04-27 08:42:46 -04:00
Mark Monteiro 15fd4812f0 Remove unnecessary foreach loop 2020-04-26 18:04:34 -04:00
Joshua M. Boniface f502c89331
Merge pull request #2798 from JustAMan/fix-livetv-again
Make localhost LiveTV restreams always use plain HTTP port
2020-04-26 15:13:27 -04:00
Joshua M. Boniface 23c8ecff37
Apply style change
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-04-26 14:58:24 -04:00
Joshua M. Boniface d92a3552b7
Apply style change
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-04-26 14:57:45 -04:00
Joshua M. Boniface 7a550d2c4e
Apply style change
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-04-26 14:57:31 -04:00
Mark Monteiro 57b5ec1d51 Remove unnecessary properties from SystemInfo response object
These properties do not provide any useful information to the client. The client would already have to have all this information in order to connect to the endpoint to retrieve it
2020-04-26 12:07:54 -04:00
Mark Monteiro 93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
sparky8251 68c7a914c3 Added option to disable metrics collection and defaulted it to off 2020-04-26 11:28:17 -04:00
Mark Monteiro bc4e72b29b Create ApplicationHost logger correctly 2020-04-20 20:48:39 -04:00