diff --git a/Disco.Data/Configuration/CommunityHelpers.cs b/Disco.Data/Configuration/CommunityHelpers.cs index da3fed44..e34a1af5 100644 --- a/Disco.Data/Configuration/CommunityHelpers.cs +++ b/Disco.Data/Configuration/CommunityHelpers.cs @@ -26,7 +26,7 @@ namespace Disco.Data.Configuration catch (Exception) { } // Ignore Errors - return "http://discoict.com.au/base/"; + return "https://discoict.com.au/base/"; } } } diff --git a/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml b/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml index b2a9aec9..ceff7fb0 100644 --- a/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml +++ b/Disco.Web/Areas/Config/Views/Plugins/Install.cshtml @@ -8,7 +8,7 @@ ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Plugins", MVC.Config.Plugins.Index(), "Install Plugin"); }
-

The plugin catalogue [http://discoict.com.au] was last updated @CommonHelpers.FriendlyDate(Model.Catalogue.ResponseTimestamp) +

The plugin catalogue [https://discoict.com.au] was last updated @CommonHelpers.FriendlyDate(Model.Catalogue.ResponseTimestamp)

@if (Model.Catalogue.Plugins.Count == 0) { diff --git a/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs b/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs index 3695ef63..19d69989 100644 --- a/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs +++ b/Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs @@ -70,13 +70,13 @@ WriteLiteral(" id=\"pluginCatalogHeading\""); WriteLiteral(">The plugin catalogue [http://discoict.com.au] was last updated "); +WriteLiteral(">https://discoict.com.au] was last updated "); #line 11 "..\..\Areas\Config\Views\Plugins\Install.cshtml" - Write(CommonHelpers.FriendlyDate(Model.Catalogue.ResponseTimestamp)); + Write(CommonHelpers.FriendlyDate(Model.Catalogue.ResponseTimestamp)); #line default @@ -160,16 +160,16 @@ WriteLiteral(" \r\n"); #line hidden WriteLiteral(" (installedPlugin != null ? " pluginInstalled" : string.Empty +, Tuple.Create(Tuple.Create("", 1625), Tuple.Create(installedPlugin != null ? " pluginInstalled" : string.Empty #line default #line hidden -, 1623), false) +, 1625), false) ); WriteLiteral(">\r\n (Url.Action(MVC.API.Plugin.Install(plugin.Id)) + , Tuple.Create(Tuple.Create("", 1948), Tuple.Create(Url.Action(MVC.API.Plugin.Install(plugin.Id)) #line default #line hidden -, 1946), false) +, 1948), false) ); WriteLiteral(">Install\r\n"); @@ -232,14 +232,14 @@ WriteLiteral(" (Url.Action(MVC.API.Plugin.Update(plugin.Id)) + , Tuple.Create(Tuple.Create("", 2363), Tuple.Create(Url.Action(MVC.API.Plugin.Update(plugin.Id)) #line default #line hidden -, 2361), false) +, 2363), false) ); WriteLiteral(">Update \r\n"); @@ -323,14 +323,14 @@ WriteLiteral(" | "); #line hidden WriteLiteral(" | (plugin.Url + , Tuple.Create(Tuple.Create("", 3124), Tuple.Create(plugin.Url #line default #line hidden -, 3122), false) +, 3124), false) ); WriteLiteral(" target=\"_blank\""); diff --git a/Disco.Web/Models/InitialConfig/CompleteModel.cs b/Disco.Web/Models/InitialConfig/CompleteModel.cs index f1fa4881..ffe3b979 100644 --- a/Disco.Web/Models/InitialConfig/CompleteModel.cs +++ b/Disco.Web/Models/InitialConfig/CompleteModel.cs @@ -50,13 +50,13 @@ namespace Disco.Web.Models.InitialConfig } #endregion - #region Communicate with http://discoict.com.au/ + #region Communicate with https://discoict.com.au/ try { Dns.GetHostEntry("discoict.com.au"); try { - HttpWebRequest wReq = (HttpWebRequest)HttpWebRequest.Create("http://discoict.com.au/"); + HttpWebRequest wReq = (HttpWebRequest)HttpWebRequest.Create("https://discoict.com.au/"); // Added: 2013-02-08 G# // Fix for Proxy Servers which dont support KeepAlive wReq.KeepAlive = false; diff --git a/Disco.Web/Views/InitialConfig/Complete.cshtml b/Disco.Web/Views/InitialConfig/Complete.cshtml index 0ba34fd9..419cb08a 100644 --- a/Disco.Web/Views/InitialConfig/Complete.cshtml +++ b/Disco.Web/Views/InitialConfig/Complete.cshtml @@ -105,16 +105,16 @@ -

Connectivity to http://discoict.com.au

+

Connectivity to https://discoict.com.au

@{ if (Model.DiscoIctComAuWebResult == null) { - A connection was successfully established to http://discoict.com.au. + A connection was successfully established to https://discoict.com.au. } else { - There was an error establishing a connection to http://discoict.com.au. This may be caused by missing proxy settings - after starting Disco check these settings in the 'System' configuration area. + There was an error establishing a connection to https://discoict.com.au. This may be caused by missing proxy settings - after starting Disco check these settings in the 'System' configuration area.
@{var ex = Model.DiscoIctComAuWebResult; diff --git a/Disco.Web/Views/InitialConfig/Complete.generated.cs b/Disco.Web/Views/InitialConfig/Complete.generated.cs index 518fc9a6..d094dec0 100644 --- a/Disco.Web/Views/InitialConfig/Complete.generated.cs +++ b/Disco.Web/Views/InitialConfig/Complete.generated.cs @@ -455,11 +455,11 @@ WriteAttribute("class", Tuple.Create(" class=\"", 4945), Tuple.Create("\"", 5021 WriteLiteral(">Connectivity to http://discoict.com.au\r\n https://discoict.com.au\r\n http://discoict.com.au."); +WriteLiteral(">https://discoict.com.au."); WriteLiteral("\r\n"); @@ -505,12 +505,12 @@ WriteLiteral(" "); WriteLiteral("There was an error establishing a connection to http://discoict.com.au. This may be caused by missing proxy settings - after" + -" starting Disco check these settings in the \'System\' configuration area."); +WriteLiteral(">https://discoict.com.au. This may be caused by missing proxy settings - afte" + +"r starting Disco check these settings in the \'System\' configuration area."); WriteLiteral("\r\n"); @@ -632,14 +632,14 @@ WriteLiteral(">\r\n"); #line hidden WriteLiteral(" (Url.Action(MVC.InitialConfig.RestartWebApp()) +, Tuple.Create(Tuple.Create("", 7804), Tuple.Create(Url.Action(MVC.InitialConfig.RestartWebApp()) #line default #line hidden -, 7798), false) +, 7804), false) ); WriteLiteral(" class=\"button\""); @@ -659,14 +659,14 @@ WriteLiteral(" (Url.Action(MVC.InitialConfig.Complete()) +, Tuple.Create(Tuple.Create("", 7969), Tuple.Create(Url.Action(MVC.InitialConfig.Complete()) #line default #line hidden -, 7963), false) +, 7969), false) ); WriteLiteral(" class=\"button\""); diff --git a/Disco.Web/Views/Shared/_Layout.cshtml b/Disco.Web/Views/Shared/_Layout.cshtml index 99e5c81d..a89750e8 100644 --- a/Disco.Web/Views/Shared/_Layout.cshtml +++ b/Disco.Web/Views/Shared/_Layout.cshtml @@ -109,7 +109,7 @@
Disco v@(Disco.Web.DiscoApplication.Version) @@ @(Disco.Web.DiscoApplication.OrganisationName) | discoict.com.au | @Html.ActionLink("Credits", MVC.Public.Public.Credits()) | @Html.ActionLink("Licence", MVC.Public.Public.Licence()) + href="https://discoict.com.au/" target="_blank">discoict.com.au | @Html.ActionLink("Credits", MVC.Public.Public.Credits()) | @Html.ActionLink("Licence", MVC.Public.Public.Licence())
@{ Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this); } diff --git a/Disco.Web/Views/Shared/_Layout.generated.cs b/Disco.Web/Views/Shared/_Layout.generated.cs index ff265f8c..03079504 100644 --- a/Disco.Web/Views/Shared/_Layout.generated.cs +++ b/Disco.Web/Views/Shared/_Layout.generated.cs @@ -720,12 +720,12 @@ WriteLiteral("@ "); #line default #line hidden -WriteLiteral(" | discoict.co" + -"m.au | "); +WriteLiteral(" | discoict.c" + +"om.au | "); #line 112 "..\..\Views\Shared\_Layout.cshtml" - Write(Html.ActionLink("Credits", MVC.Public.Public.Credits())); + Write(Html.ActionLink("Credits", MVC.Public.Public.Credits())); #line default @@ -734,7 +734,7 @@ WriteLiteral(" | "); #line 112 "..\..\Views\Shared\_Layout.cshtml" - Write(Html.ActionLink("Licence", MVC.Public.Public.Licence())); + Write(Html.ActionLink("Licence", MVC.Public.Public.Licence())); #line default