Mark Monteiro
a10aec6956
Fix merge
2020-05-10 18:17:12 -04:00
Mark Monteiro
dc5165b97f
Merge branch 'master' into simplify-https-config
2020-05-10 14:43:57 -04:00
dkanada
176159d0a8
Merge pull request #2969 from BaronGreenback/my-feature
...
http in development mode crashed -
2020-05-07 02:24:42 +09:00
BaronGreenback
ba2134de13
Made changes to message and exception class
2020-05-06 16:04:07 +01:00
Mark Monteiro
1c06111497
Merge remote-tracking branch 'upstream/master' into integration-tests
2020-05-03 01:04:19 -04:00
Mark Monteiro
679f97d5e9
Merge remote-tracking branch 'upstream/master' into simplify-https-config
...
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
2020-04-26 17:37:30 -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
BaronGreenback
a0a5512069
2969 - re-issed code to address when developer doesn't have certificate installed.
2020-04-26 19:35:36 +01: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
Mark Monteiro
cd98938190
Merge remote-tracking branch 'upstream/master' into integration-tests
2020-04-23 19:32:40 -04:00
Admin
d1684b1053
http in development mode crashed -
2020-04-23 18:30:48 +01:00
Mark Monteiro
51b610b999
Expose some methods in Program.cs so they can be used to initialize the application for integration tests
2020-04-20 14:58:00 -04:00
Vasily
626d4dab10
Make sure Jellyfin listens on localhost no matter what
...
This is needed by LiveTV
2020-04-08 13:45:53 +03:00
Mark Monteiro
5bc6c08a0a
Merge remote-tracking branch 'upstream/master' into simplify-https-config
2020-04-06 00:24:11 -04:00
Mark Monteiro
f91f2ef328
Merge remote-tracking branch 'upstream/master' into register-services-correctly
2020-04-05 10:07:17 -04:00
Bond-009
29539174a3
Merge pull request #2636 from mark-monteiro/development-https
...
Use ASP.NET Core HTTPS Development Certificate
2020-04-05 15:09:27 +02:00
Mark Monteiro
aee6a1b476
Remove unnecessary async and parameter from ApplicationHost initialization method
2020-04-04 20:40:50 -04:00
Mark Monteiro
5d648bf54f
Register and construct ILocalizationManager correctly
2020-04-04 20:21:48 -04:00
Mark Monteiro
07cebbeae2
Register and construct IImageProcessor, SqliteItemRepository and IImageEncoder correctly
2020-04-04 17:12:24 -04:00
Mark Monteiro
0ce82ab332
Remove unnecessary fields in ApplicationHost
2020-04-04 15:05:50 -04:00
Mark Monteiro
ca71ac72ab
Replace EnableHttps and SupportsHttps with ListenWithHttps and CanConnectWithHttps
2020-04-02 17:45:04 -04:00
Vasily
89448ac055
Merge pull request #2634 from mark-monteiro/enable-http2
...
Enable HTTP/2 support
2020-04-02 13:54:05 +03:00
Mark Monteiro
0e57348cf4
Merge remote-tracking branch 'upstream/master' into development-https
2020-04-01 23:21:30 +02:00
Bond-009
f31efce52d
Merge branch 'master' into usings
2020-04-01 22:42:43 +02:00
Mark Monteiro
ca85bef7c5
Move check for web client directory to application startup in Program.cs
2020-03-25 18:52:14 +01:00
Bond-009
eb09d47ed2
Update Jellyfin.Server/Program.cs
...
Co-Authored-By: Mark Monteiro <marknr.monteiro@protonmail.com>
2020-03-24 17:43:11 +01:00
Bond_009
e9d1eabd53
Remove unused usings
2020-03-24 16:12:06 +01:00
Mark Monteiro
54cbf9c4dc
Bind HTTPS ports when running with development environment flag
2020-03-21 21:31:22 +01:00
Mark Monteiro
1fb939b9b2
Enable HTTP/2 support
2020-03-21 20:21:07 +01:00
Mark Monteiro
aa546dd36a
Rename command line option to --nowebclient and config setting to HostWebClient
2020-03-21 18:25:09 +01:00
Mark Monteiro
05ab61200a
Do not call UseContentRoot() on the web host builder
...
This call has nothing to do with static web content and should not have ever been called with the web content path: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/?view=aspnetcore-3.1&tabs=windows#content-root
Since this call is removed, the ContentRoot property is also removed from ApplicationHost as it is no longer needed.
Finally, move validation of the static content path to the DashboardService where it is actually used.
2020-03-15 17:42:57 +01:00
Mark Monteiro
2a01537371
Merge command line options into framework configuration
2020-03-15 15:34:09 +01:00
Mark Monteiro
6fbdf0d6a2
Construct ApplicationHost with DI framework instead of manually
2020-03-15 15:28:29 +01:00
Mark Monteiro
6a6293afc7
Make startup config nullable when configuring app configuration
2020-03-15 13:15:47 +01:00
Mark Monteiro
420e3619fb
Use startup configuration to set the default redirect path
2020-03-15 13:01:05 +01:00
Mark Monteiro
4102e3afd0
Rename IsNoWebContent to NoWebContent
2020-03-15 13:00:14 +01:00
Mark Monteiro
99bf6edba2
Merge remote-tracking branch 'upstream/master' into support-running-without-web-content
2020-03-11 23:04:47 +01:00
Mark Monteiro
29bad073eb
Use config setting to decide if web content should be hosted
...
Also fail server startup if web content is expected but missing
2020-03-11 22:54:54 +01:00
Mark Monteiro
6131599e88
Merge branch 'master' into support-injecting-iconfiguration
2020-03-10 22:45:17 +01:00
Mark Monteiro
8dbb1c9257
Use logging.json instead of logging.user.json for override settings
2020-03-08 15:46:13 +01:00
Mark Monteiro
6660006f01
Load user logging config file into application configuration
2020-03-06 19:28:36 +01:00
Mark Monteiro
f2fdf50b3b
Create separate constants for the two logging file names
2020-03-06 19:07:34 +01:00
Vasily
ecaa7f8014
Improve migration logic
2020-03-05 20:09:33 +03:00
Vasily
9eef0e8ca0
Implement EnableThrottling migration for pre-10.5.0 to 10.5.0 or newer
2020-03-05 17:41:32 +03:00
Mark Monteiro
76957213e6
Merge remote-tracking branch 'upstream/master' into support-injecting-iconfiguration
2020-03-03 22:27:49 +01:00
Mark Monteiro
c376f4ca51
Register Serilog logging services correctly
2020-03-03 00:35:41 +01:00
Mark Monteiro
48f8118072
Do not save a reference to the startup config in ApplicationHost
2020-02-28 23:28:15 +01:00
Mark Monteiro
a4e5a5ab31
Register configuration correctly with application using 'ConfigureAppConfiguration()' in WebHostBuilder
...
Without this, the correct instance of IConfiguration is not injected into services that rely on it
2020-02-28 23:18:22 +01:00
Mark Monteiro
3043b7323b
Use constants for settings keys
2020-02-28 17:57:38 +01:00