diff --git a/Changelog.md b/Changelog.md
index 88453ee48..2e67d6d94 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -36,6 +36,7 @@ Although the chat was never enabled per default and was marked as experimental,
# 0.7.15.0
## Refactor
+* Replaced some `http://` links in the UI with their `https://` counterparts [#8207](https://github.com/diaspora/diaspora/pull/8207)
## Bug fixes
* Update comment counter when weleting a comment in the Single Post View [#7938](https://github.com/diaspora/diaspora/pull/7938)
diff --git a/app/assets/javascripts/app/helpers/locations.js b/app/assets/javascripts/app/helpers/locations.js
index ca9a04c7c..df7bb5009 100644
--- a/app/assets/javascripts/app/helpers/locations.js
+++ b/app/assets/javascripts/app/helpers/locations.js
@@ -6,8 +6,8 @@
return L.tileLayer("https://api.mapbox.com/styles/v1/{style}/tiles/256/{z}/{x}/{y}?access_token={accessToken}", {
accessToken: gon.appConfig.map.mapbox.access_token,
style: gon.appConfig.map.mapbox.style,
- attribution: "Map data © OpenStreetMap contributors, " +
- "CC-BY-SA, " +
+ attribution: "Map data © OpenStreetMap contributors, " +
+ "CC-BY-SA, " +
"Imagery © Mapbox",
maxZoom: 18
});
@@ -15,7 +15,7 @@
// maptiles from the Heidelberg University are used by default.
return L.tileLayer("http://korona.geog.uni-heidelberg.de/tiles/roads/x={x}&y={y}&z={z}", {
- attribution: "Map data © OpenStreetMap contributors, " +
+ attribution: "Map data © OpenStreetMap contributors, " +
"rendering " +
"GIScience Research Group @ Heidelberg University",
maxZoom: 18
diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js
index 619395b6e..1d87cdfae 100644
--- a/app/assets/javascripts/app/views/help_view.js
+++ b/app/assets/javascripts/app/views/help_view.js
@@ -12,9 +12,10 @@ app.views.Help = app.views.StaticContentView.extend({
"click .faq-link-keyboard-shortcuts": "keyboardShortcuts"
},
+ /* eslint-disable camelcase */
initialize : function() {
this.GETTING_HELP_SUBS = {
- getting_started_a: {tutorial_series: this.linkHtml("http://diasporafoundation.org/getting_started/sign_up", Diaspora.I18n.t("getting_started_tutorial"))},
+ getting_started_a: {tutorial_series: this.linkHtml("https://diasporafoundation.org/getting_started/sign_up", Diaspora.I18n.t("getting_started_tutorial"))},
get_support_a_website: {link: this.linkHtml("https://diasporafoundation.org/", Diaspora.I18n.t("foundation_website"))},
get_support_a_tutorials: {tutorials: this.linkHtml("https://diasporafoundation.org/tutorials", Diaspora.I18n.t("tutorials"))},
get_support_a_wiki: {link: this.linkHtml("https://wiki.diasporafoundation.org/Special:Search", Diaspora.I18n.t("wiki"))},
@@ -27,10 +28,11 @@ app.views.Help = app.views.StaticContentView.extend({
this.POSTS_AND_POSTING_SUBS = {
post_report_a: {community_guidelines: this.linkHtml("https://diasporafoundation.org/community_guidelines", Diaspora.I18n.t("community_guidelines"))},
format_text_a: {
- markdown: this.linkHtml("http://diasporafoundation.org/formatting", Diaspora.I18n.t( 'markdown' )),
- here: this.linkHtml("http://daringfireball.net/projects/markdown/syntax", Diaspora.I18n.t( 'here' ))
+ markdown: this.linkHtml("https://diasporafoundation.org/formatting", Diaspora.I18n.t("markdown")),
+ here: this.linkHtml("https://daringfireball.net/projects/markdown/syntax", Diaspora.I18n.t("here"))
}
};
+ /* eslint-enable camelcase */
this.TAGS_SUBS = {
filter_tags_a: {
diff --git a/app/helpers/meta_data_helper.rb b/app/helpers/meta_data_helper.rb
index 03758ed62..4f12c3491 100644
--- a/app/helpers/meta_data_helper.rb
+++ b/app/helpers/meta_data_helper.rb
@@ -5,7 +5,7 @@ module MetaDataHelper
include ActionView::Helpers::TagHelper
def og_prefix
- 'og: http://ogp.me/ns# article: http://ogp.me/ns/article# profile: http://ogp.me/ns/profile#'
+ "og: https://ogp.me/ns# article: https://ogp.me/ns/article# profile: https://ogp.me/ns/profile#"
end
def site_url
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index f69edd2d3..56be82d92 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -63,7 +63,7 @@
tag_path(name: t("shared.publisher.new_user_prefill.newhere"))))
%br
= link_to(t("aspects.index.new_here.learn_more"),
- "http://wiki.diasporafoundation.org/Welcoming_Committee")
+ "https://wiki.diasporafoundation.org/Welcoming_Committee")
.section.collapsed
.title
@@ -94,7 +94,7 @@
faq: link_to(t("_help"), help_path),
tutorial: link_to(t("aspects.index.help.tutorial_link_text"),
"https://diasporafoundation.org/tutorials", target: "_blank"),
- wiki: link_to("Wiki", "http://wiki.diasporafoundation.org",
+ wiki: link_to("Wiki", "https://wiki.diasporafoundation.org",
target: "_blank"),
target: "_blank")
diff --git a/app/views/terms/default.haml b/app/views/terms/default.haml
index c872974ea..477626dba 100644
--- a/app/views/terms/default.haml
+++ b/app/views/terms/default.haml
@@ -142,7 +142,9 @@
Source code and materials
%p
- This Service runs on a diaspora* social network server. This source code is licensed under an AGPLv3 license which means you are allowed to and even encouraged to take the source code, modify it and use it.
+ This Service runs on a diaspora* social network server. This source code is licensed under an
+ AGPLv3 license which means you are allowed
+ to and even encouraged to take the source code, modify it and use it.
%p
For full details about the diaspora* server see here.
diff --git a/config/routes.rb b/config/routes.rb
index 2fbbcf479..9a5782a41 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -208,7 +208,7 @@ Rails.application.routes.draw do
get 'help/:topic' => 'help#faq'
#Protocol Url
- get 'protocol' => redirect("http://wiki.diasporafoundation.org/Federation_Protocol_Overview")
+ get "protocol" => redirect("https://wiki.diasporafoundation.org/Federation_Protocol_Overview")
# NodeInfo
get ".well-known/nodeinfo", to: "node_info#jrd"