Skip to content

Commit 2f2c109

Browse files
committed
Merge pull request #859 from apinf/hotfix/mixed-content-over-SSL
Hotfix/mixed content over ssl
2 parents baa9b0a + 8111daf commit 2f2c109

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

client/lib/AdminLTE/css/AdminLTE.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/lib/chartsjs/d3.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -604,11 +604,11 @@
604604
};
605605
}
606606
var d3_nsPrefix = {
607-
svg: "http://www.w3.org/2000/svg",
608-
xhtml: "http://www.w3.org/1999/xhtml",
609-
xlink: "http://www.w3.org/1999/xlink",
610-
xml: "http://www.w3.org/XML/1998/namespace",
611-
xmlns: "http://www.w3.org/2000/xmlns/"
607+
svg: "https://www.w3.org/2000/svg",
608+
xhtml: "https://www.w3.org/1999/xhtml",
609+
xlink: "https://www.w3.org/1999/xlink",
610+
xml: "https://www.w3.org/XML/1998/namespace",
611+
xmlns: "https://www.w3.org/2000/xmlns/"
612612
};
613613
d3.ns = {
614614
prefix: d3_nsPrefix,

client/views/dashboard/charts/charts.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,10 @@ Template.chartsLayout.created = function () {
328328
instance.map = L.map('map').setView([61.5000, 23.7667], 4);
329329

330330
// adds tilelayer
331-
var tiles = L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
331+
var tiles = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
332332
maxZoom: 19,
333333
minZoom: 2,
334-
attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
334+
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>'
335335
}).addTo(instance.map);
336336

337337
// checks if map data is passed to a renderMap function

public/swagger/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
if (url && url.length > 1) {
2828
url = decodeURIComponent(url[1]);
2929
} else {
30-
url = "http://petstore.swagger.io/v2/swagger.json";
30+
url = "https://petstore.swagger.io/v2/swagger.json";
3131
}
3232
window.swaggerUi = new SwaggerUi({
3333
url: url,

0 commit comments

Comments
 (0)