jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Community Services use HTTPS #21

Browse Source
This commit is contained in:
Gary Sharp
2013-10-17 11:34:22 +11:00
parent fdb5d37ec8
commit d6859dcde4
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Data/Configuration/CommunityHelpers.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace Disco.Data.Configuration
catch (Exception)
{ } // Ignore Errors
return "http://discoict.com.au/base/";
return "https://discoict.com.au/base/";
}
}
}
Disco.Web/Areas/Config/Views/Plugins/Install.cshtml
+1 -1
View File
@@ -8,7 +8,7 @@
ViewBag.Title = Html.ToBreadcrumb("Configuration", MVC.Config.Config.Index(), "Plugins", MVC.Config.Plugins.Index(), "Install Plugin");
}
<div id="pluginCatalog">
<h4 id="pluginCatalogHeading">The plugin catalogue [<a href="http://discoict.com.au/">http://discoict.com.au</a>] was last updated @CommonHelpers.FriendlyDate(Model.Catalogue.ResponseTimestamp)
<h4 id="pluginCatalogHeading">The plugin catalogue [<a href="https://discoict.com.au/">https://discoict.com.au</a>] was last updated @CommonHelpers.FriendlyDate(Model.Catalogue.ResponseTimestamp)
</h4>
@if (Model.Catalogue.Plugins.Count == 0)
{
Disco.Web/Areas/Config/Views/Plugins/Install.generated.cs
+17 -17
View File
@@ -70,13 +70,13 @@ WriteLiteral(" id=\"pluginCatalogHeading\"");
WriteLiteral(">The plugin catalogue [<a");
WriteLiteral(" href=\"http://discoict.com.au/\"");
WriteLiteral(" href=\"https://discoict.com.au/\"");
WriteLiteral(">http://discoict.com.au</a>] was last updated ");
WriteLiteral(">https://discoict.com.au</a>] 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(" <td>\r\n");
#line hidden
WriteLiteral(" <div");
WriteAttribute("class", Tuple.Create(" class=\"", 1592), Tuple.Create("\"", 1685)
, Tuple.Create(Tuple.Create("", 1600), Tuple.Create("pageMenuArea", 1600), true)
, Tuple.Create(Tuple.Create(" ", 1612), Tuple.Create("pluginItem", 1613), true)
WriteAttribute("class", Tuple.Create(" class=\"", 1594), Tuple.Create("\"", 1687)
, Tuple.Create(Tuple.Create("", 1602), Tuple.Create("pageMenuArea", 1602), true)
, Tuple.Create(Tuple.Create(" ", 1614), Tuple.Create("pluginItem", 1615), true)
#line 36 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
, Tuple.Create(Tuple.Create("", 1623), Tuple.Create<System.Object, System.Int32>(installedPlugin != null ? " pluginInstalled" : string.Empty
, Tuple.Create(Tuple.Create("", 1625), Tuple.Create<System.Object, System.Int32>(installedPlugin != null ? " pluginInstalled" : string.Empty
#line default
#line hidden
, 1623), false)
, 1625), false)
);
WriteLiteral(">\r\n <h2");
@@ -205,14 +205,14 @@ WriteLiteral(" <a");
WriteLiteral(" class=\"pluginInstallLink button\"");
WriteAttribute("href", Tuple.Create(" href=\"", 1939), Tuple.Create("\"", 1994)
WriteAttribute("href", Tuple.Create(" href=\"", 1941), Tuple.Create("\"", 1996)
#line 40 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
, Tuple.Create(Tuple.Create("", 1946), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Install(plugin.Id))
, Tuple.Create(Tuple.Create("", 1948), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Install(plugin.Id))
#line default
#line hidden
, 1946), false)
, 1948), false)
);
WriteLiteral(">Install</a>\r\n");
@@ -232,14 +232,14 @@ WriteLiteral(" <a");
WriteLiteral(" class=\"pluginUpdateLink button\"");
WriteAttribute("href", Tuple.Create(" href=\"", 2354), Tuple.Create("\"", 2408)
WriteAttribute("href", Tuple.Create(" href=\"", 2356), Tuple.Create("\"", 2410)
#line 46 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
, Tuple.Create(Tuple.Create("", 2361), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Update(plugin.Id))
, Tuple.Create(Tuple.Create("", 2363), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Plugin.Update(plugin.Id))
#line default
#line hidden
, 2361), false)
, 2363), false)
);
WriteLiteral(">Update</a> \r\n");
@@ -323,14 +323,14 @@ WriteLiteral("</span> | ");
#line hidden
WriteLiteral(" | <a");
WriteAttribute("href", Tuple.Create(" href=\"", 3115), Tuple.Create("\"", 3133)
WriteAttribute("href", Tuple.Create(" href=\"", 3117), Tuple.Create("\"", 3135)
#line 56 "..\..\Areas\Config\Views\Plugins\Install.cshtml"
, Tuple.Create(Tuple.Create("", 3122), Tuple.Create<System.Object, System.Int32>(plugin.Url
, Tuple.Create(Tuple.Create("", 3124), Tuple.Create<System.Object, System.Int32>(plugin.Url
#line default
#line hidden
, 3122), false)
, 3124), false)
);
WriteLiteral(" target=\"_blank\"");
Disco.Web/Models/InitialConfig/CompleteModel.cs
+2 -2
View File
@@ -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;
Disco.Web/Views/InitialConfig/Complete.cshtml
+3 -3
View File
@@ -105,16 +105,16 @@
</tr>
<tr>
<td>
<h3><span class="icon @(Model.DiscoIctComAuWebResult == null ? "success" : "warning")"></span>Connectivity to <a href="http://discoict.com.au" target="_blank">http://discoict.com.au</a></h3>
<h3><span class="icon @(Model.DiscoIctComAuWebResult == null ? "success" : "warning")"></span>Connectivity to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a></h3>
<div class="testResult">
@{
if (Model.DiscoIctComAuWebResult == null)
{
<text>A connection was successfully established to <a href="http://discoict.com.au" target="_blank">http://discoict.com.au</a>.</text>
<text>A connection was successfully established to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a>.</text>
}
else
{
<text>There was an error establishing a connection to <a href="http://discoict.com.au" target="_blank">http://discoict.com.au</a>. This may be caused by missing proxy settings - after starting Disco check these settings in the 'System' configuration area.</text>
<text>There was an error establishing a connection to <a href="https://discoict.com.au" target="_blank">https://discoict.com.au</a>. This may be caused by missing proxy settings - after starting Disco check these settings in the 'System' configuration area.</text>
<br />
<div class="exception">
@{var ex = Model.DiscoIctComAuWebResult;
Disco.Web/Views/InitialConfig/Complete.generated.cs
+13 -13
View File
@@ -455,11 +455,11 @@ WriteAttribute("class", Tuple.Create(" class=\"", 4945), Tuple.Create("\"", 5021
WriteLiteral("></span>Connectivity to <a");
WriteLiteral(" href=\"http://discoict.com.au\"");
WriteLiteral(" href=\"https://discoict.com.au\"");
WriteLiteral(" target=\"_blank\"");
WriteLiteral(">http://discoict.com.au</a></h3>\r\n <div");
WriteLiteral(">https://discoict.com.au</a></h3>\r\n <div");
WriteLiteral(" class=\"testResult\"");
@@ -484,11 +484,11 @@ WriteLiteral(" ");
WriteLiteral("A connection was successfully established to <a");
WriteLiteral(" href=\"http://discoict.com.au\"");
WriteLiteral(" href=\"https://discoict.com.au\"");
WriteLiteral(" target=\"_blank\"");
WriteLiteral(">http://discoict.com.au</a>.");
WriteLiteral(">https://discoict.com.au</a>.");
WriteLiteral("\r\n");
@@ -505,12 +505,12 @@ WriteLiteral(" ");
WriteLiteral("There was an error establishing a connection to <a");
WriteLiteral(" href=\"http://discoict.com.au\"");
WriteLiteral(" href=\"https://discoict.com.au\"");
WriteLiteral(" target=\"_blank\"");
WriteLiteral(">http://discoict.com.au</a>. This may be caused by missing proxy settings - after" +
" starting Disco check these settings in the \'System\' configuration area.");
WriteLiteral(">https://discoict.com.au</a>. 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(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 7791), Tuple.Create("\"", 7846)
WriteAttribute("href", Tuple.Create(" href=\"", 7797), Tuple.Create("\"", 7852)
#line 161 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create("", 7798), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.RestartWebApp())
, Tuple.Create(Tuple.Create("", 7804), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.RestartWebApp())
#line default
#line hidden
, 7798), false)
, 7804), false)
);
WriteLiteral(" class=\"button\"");
@@ -659,14 +659,14 @@ WriteLiteral(" <a");
WriteLiteral(" id=\"tryAgain\"");
WriteAttribute("href", Tuple.Create(" href=\"", 7956), Tuple.Create("\"", 8006)
WriteAttribute("href", Tuple.Create(" href=\"", 7962), Tuple.Create("\"", 8012)
#line 165 "..\..\Views\InitialConfig\Complete.cshtml"
, Tuple.Create(Tuple.Create("", 7963), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.Complete())
, Tuple.Create(Tuple.Create("", 7969), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.InitialConfig.Complete())
#line default
#line hidden
, 7963), false)
, 7969), false)
);
WriteLiteral(" class=\"button\"");
Disco.Web/Views/Shared/_Layout.cshtml
+1 -1
View File
@@ -109,7 +109,7 @@
</section>
<footer>
Disco v@(Disco.Web.DiscoApplication.Version) @@ @(Disco.Web.DiscoApplication.OrganisationName) | <a
href="http://discoict.com.au/" target="_blank">discoict.com.au</a> | @Html.ActionLink("Credits", MVC.Public.Public.Credits()) | @Html.ActionLink("Licence", MVC.Public.Public.Licence())
href="https://discoict.com.au/" target="_blank">discoict.com.au</a> | @Html.ActionLink("Credits", MVC.Public.Public.Credits()) | @Html.ActionLink("Licence", MVC.Public.Public.Licence())
</footer>
</div>
@{ Disco.Services.Plugins.Features.UIExtension.UIExtensions.ExecuteExtensionResult(this); }
Disco.Web/Views/Shared/_Layout.generated.cs
+4 -4
View File
@@ -720,12 +720,12 @@ WriteLiteral("@ ");
#line default
#line hidden
WriteLiteral(" | <a\r\n href=\"http://discoict.com.au/\" target=\"_blank\">discoict.co" +
"m.au</a> | ");
WriteLiteral(" | <a\r\n href=\"https://discoict.com.au/\" target=\"_blank\">discoict.c" +
"om.au</a> | ");
#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