diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-17 15:17:01 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-17 15:17:01 -0500 |
| commit | 7903037524cafd88f3989d4c91b9c883751f5b89 (patch) | |
| tree | a8bbb3535fafd0ea6fad079e5fec14fbc3059c92 | |
| parent | d26707708d7b396d0eb4a61035a30f7bfbcb33f8 (diff) | |
| parent | 1d331dab1218ec57da17bbfb9574607ad60941e4 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Conflicts:
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
| -rw-r--r-- | MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/ApplicationHost.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index 8acce7b725..ad7a0aef09 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -194,6 +194,7 @@ "LabelVideoCodec": "Video: {0}", "LabelRemoteAccessUrl": "Remote access: {0}", "LabelRunningOnPort": "Running on port {0}.", + "LabelRunningOnHttpsPort": "Running on SSL port {0}.", "HeaderLatestFromChannel": "Latest from {0}", "ButtonDownload": "Download", "LabelUnknownLanaguage": "Unknown language", diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 0d8b651904..e15b60d479 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -977,6 +977,7 @@ namespace MediaBrowser.Server.Startup.Common CachePath = ApplicationPaths.CachePath, MacAddress = GetMacAddress(), HttpServerPortNumber = HttpServerPort, + HttpsPortNumber = HttpsServerPort, OperatingSystem = OperatingSystemDisplayName, CanSelfRestart = CanSelfRestart, CanSelfUpdate = CanSelfUpdate, |