From c634d5f03c5c33217459c6786ee44e98159254c9 Mon Sep 17 00:00:00 2001 From: Georg Gadinger Date: Sun, 26 Apr 2020 23:12:29 +0200 Subject: [PATCH 1/3] Update some dead links --- app/views/static/about.html.haml | 2 +- app/views/static/front.html.haml | 4 +--- public/404.html | 2 +- public/422.html | 2 +- public/500.html | 4 ++-- public/502.html | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml index 4275d4f5..e657ced4 100644 --- a/app/views/static/about.html.haml +++ b/app/views/static/about.html.haml @@ -29,7 +29,7 @@ .col-md-4 %h3= t 'views.about.opensource.title' %p= t('views.about.opensource.warning', app_title: APP_CONFIG['site_name']) - %p= raw t('views.about.opensource.desc', app_title: APP_CONFIG['site_name'], github: link_to(t('views.about.opensource.github'), "https://github.com/Retrospring/retrospring"), bugtracker: link_to(t('views.about.opensource.bugtracker'), "https://github.com/Retrospring/bugs")) + %p= raw t('views.about.opensource.desc', app_title: APP_CONFIG['site_name'], github: link_to(t('views.about.opensource.github'), "https://github.com/Retrospring/retrospring"), bugtracker: link_to(t('views.about.opensource.bugtracker'), "https://github.com/Retrospring/retrospring/issues")) .col-md-4 %a{href: "https://github.com/Retrospring/retrospring"} .icon-showcase diff --git a/app/views/static/front.html.haml b/app/views/static/front.html.haml index 7eb781b2..57e359ab 100644 --- a/app/views/static/front.html.haml +++ b/app/views/static/front.html.haml @@ -102,9 +102,7 @@ .container-fluid.frontpage-fluid %p Any questions? Ask us on - %a{href: "https://twitter.com/retrospringnet"} Twitter - or visit one of the administrator profiles you can find on the - %a{href: about_path} About page! + %a{href: "https://twitter.com/retrospring"} Twitter .container.text-center#register %h2 What are you waiting for? %p diff --git a/public/404.html b/public/404.html index 1614037a..a558c18d 100644 --- a/public/404.html +++ b/public/404.html @@ -48,7 +48,7 @@ -

404. It dun goofed. But play some Pong while you're at it.

Is it a bug? · Back to Retrospring +

404. It dun goofed. But play some Pong while you're at it.

Is it a bug? · Back to Retrospring diff --git a/public/422.html b/public/422.html index 79f198d4..ab3c4c4f 100644 --- a/public/422.html +++ b/public/422.html @@ -48,7 +48,7 @@ -

422. The change you wanted was rejected. But play some Pong while you're at it.

Is it a bug? · Back to Retrospring +

422. The change you wanted was rejected. But play some Pong while you're at it.

Is it a bug? · Back to Retrospring diff --git a/public/500.html b/public/500.html index 9ac1c1d0..de5d2799 100644 --- a/public/500.html +++ b/public/500.html @@ -52,9 +52,9 @@ -

500. Something went wrong :( But play some Pong while you're at it.

Is it a bug? · Back to Retrospring +

500. Something went wrong :( But play some Pong while you're at it.

Is it a bug? · Back to Retrospring - \ No newline at end of file + diff --git a/public/502.html b/public/502.html index 6fe3ccf1..18741040 100644 --- a/public/502.html +++ b/public/502.html @@ -79,7 +79,7 @@

Sorry about that. Please try refreshing and contact us if the problem persists.

- Bug tracker · + Bug tracker · Twitter
From b2b6419b5dea1ac72e585d59db4dfa90f52d3069 Mon Sep 17 00:00:00 2001 From: Georg Gadinger Date: Sun, 26 Apr 2020 23:16:20 +0200 Subject: [PATCH 2/3] Use HTTPS in links --- app/views/inbox/_sidebar.html.haml | 2 +- app/views/static/front.html.haml | 2 +- app/views/user/edit.html.haml | 2 +- public/404.html | 2 +- public/422.html | 2 +- public/500.html | 2 +- public/humans.txt | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/inbox/_sidebar.html.haml b/app/views/inbox/_sidebar.html.haml index 9da5bd77..aa18a49a 100644 --- a/app/views/inbox/_sidebar.html.haml +++ b/app/views/inbox/_sidebar.html.haml @@ -10,7 +10,7 @@ %a.btn.btn-block.btn-primary{target: '_blank', href: "https://twitter.com/intent/tweet?text=Ask%20me%20anything%21&url=#{show_user_profile_url(current_user.screen_name)}"} %i.fa.fa-fw.fa-twitter = raw t('views.inbox.sidebar.share.button', service: "Twitter") - %a.btn.btn-block.btn-primary{target: '_blank', href: "http://www.tumblr.com/share/link?url=#{show_user_profile_url(current_user.screen_name)}&name=Ask%20me%20anything%21"} + %a.btn.btn-block.btn-primary{target: '_blank', href: "https://www.tumblr.com/share/link?url=#{show_user_profile_url(current_user.screen_name)}&name=Ask%20me%20anything%21"} %i.fa.fa-fw.fa-tumblr = raw t('views.inbox.sidebar.share.button', service: "Tumblr") .panel.panel-default.inbox--panel diff --git a/app/views/static/front.html.haml b/app/views/static/front.html.haml index 57e359ab..b220c168 100644 --- a/app/views/static/front.html.haml +++ b/app/views/static/front.html.haml @@ -89,7 +89,7 @@ We don't like them ourselves, really. = APP_CONFIG['site_name'] just runs with community funding over - %a{href: "http://patreon.com/retrospring"} Patreon + %a{href: "https://patreon.com/retrospring"} Patreon which is way better than displaying annoying stuff. .col-md-4.col-sm-4.col-xs-12 %h3.heading-showcase diff --git a/app/views/user/edit.html.haml b/app/views/user/edit.html.haml index 0120ecf6..19d368dd 100644 --- a/app/views/user/edit.html.haml +++ b/app/views/user/edit.html.haml @@ -45,7 +45,7 @@ = f.text_field :motivation_header, label: t('views.settings.profile.motivation'), placeholder: t('views.settings.profile.placeholder.motivation') - = f.text_field :website, label: t('views.settings.profile.website'), placeholder: 'http://example.com' + = f.text_field :website, label: t('views.settings.profile.website'), placeholder: 'https://example.com' = f.text_field :location, label: t('views.settings.profile.location'), placeholder: t('views.settings.profile.placeholder.location') diff --git a/public/404.html b/public/404.html index a558c18d..ddae1139 100644 --- a/public/404.html +++ b/public/404.html @@ -48,7 +48,7 @@ -

404. It dun goofed. But play some Pong while you're at it.

Is it a bug? · Back to Retrospring +

404. It dun goofed. But play some Pong while you're at it.

Is it a bug? · Back to Retrospring diff --git a/public/422.html b/public/422.html index ab3c4c4f..60c1d714 100644 --- a/public/422.html +++ b/public/422.html @@ -48,7 +48,7 @@ -

422. The change you wanted was rejected. But play some Pong while you're at it.

Is it a bug? · Back to Retrospring +

422. The change you wanted was rejected. But play some Pong while you're at it.

Is it a bug? · Back to Retrospring diff --git a/public/500.html b/public/500.html index de5d2799..2e92696e 100644 --- a/public/500.html +++ b/public/500.html @@ -52,7 +52,7 @@ -

500. Something went wrong :( But play some Pong while you're at it.

Is it a bug? · Back to Retrospring +

500. Something went wrong :( But play some Pong while you're at it.

Is it a bug? · Back to Retrospring diff --git a/public/humans.txt b/public/humans.txt index 2bfc4436..f1f01b0d 100644 --- a/public/humans.txt +++ b/public/humans.txt @@ -1,9 +1,9 @@ /* TEAM */ Georg G. (nilsding [at] nilsding [dot] org) - Site: http://nilsding.org - Location: Austria + Site: https://nilsding.org + Location: Linz, Austria Andreas N. (pixeldesu [at] outlook [dot] com) - Site: http://pixelde.su + Site: https://pixelde.su Location: Germany From dc25b5f0c187d60fb8de1589deaffa28d48881d7 Mon Sep 17 00:00:00 2001 From: Georg Gadinger Date: Sun, 26 Apr 2020 23:18:02 +0200 Subject: [PATCH 3/3] Capitalise organisation name in GitHub urls --- app/views/shared/_links.html.haml | 2 +- service-docs/en/help/faq.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_links.html.haml b/app/views/shared/_links.html.haml index ed2f92b4..f943e838 100644 --- a/app/views/shared/_links.html.haml +++ b/app/views/shared/_links.html.haml @@ -5,7 +5,7 @@ · = link_to t('views.general.about'), about_path · - = link_to "GitHub", 'https://github.com/retrospring/retrospring' + = link_to "GitHub", 'https://github.com/Retrospring/retrospring' · = link_to t('views.general.terms'), terms_path · diff --git a/service-docs/en/help/faq.md b/service-docs/en/help/faq.md index 53e54fd3..2bffa987 100644 --- a/service-docs/en/help/faq.md +++ b/service-docs/en/help/faq.md @@ -7,7 +7,7 @@ No, Retrospring will always remain free. You can however, if you want to support ## 3. Do you do anything with our data? No. We don't sell it to any third parties. Your data doesn't leave our servers, because we need it if any user does something illegal we have to provide the data or at least check it up and validate the cases ourselves. But anything other than that is not going to happen, such as us selling your precious data to big bad evil companies. ## 4. Can I contribute to the random question pool? -You are more than welcome too, over on [Github](https://github.com/retrospring/questiongenerator)! +You are more than welcome too, over on [Github](https://github.com/Retrospring/questiongenerator)! ## 5. What are **motivation headers**? The motivation header is the short text shown in the top of the questionbox on your profile, motivating another user to ask you a question. You can write anything you want, but the best way using it would be including something like "Ask me anything!" or if you want questions about a special thing you did "Ask me anything about my project X!" so people know what they should ask you. ## 6. Will Retrospring be available in different languages? @@ -30,4 +30,4 @@ Quotes? Here you go!: Don't like the formatting? You can escape it with prepending a `\` before the `*`, `_` or `>` ## 8. Is this open-source software? -Yep! Retrospring runs [justask](https://github.com/nilsding/justask) an open source (AGPLv3) question and answer platform. If you want to contribute or report bugs you find in Retrospring, please look at our [Github repository!](https://github.com/retrospring/retrospring)! +Yep! Retrospring runs [justask](https://github.com/nilsding/justask) an open source (AGPLv3) question and answer platform. If you want to contribute or report bugs you find in Retrospring, please look at our [Github repository!](https://github.com/Retrospring/retrospring)!