From 61382d8fc03c31e4886df9fab14ac1063146a3e8 Mon Sep 17 00:00:00 2001 From: Tuan Date: Wed, 17 Mar 2021 16:45:59 +0000 Subject: [PATCH] Links updated --- .../glitch/features/ui/components/link_footer.js | 13 +++++++------ .../features/ui/components/onboarding_modal.js | 4 ++-- .../mastodon/features/ui/components/link_footer.js | 2 +- app/views/about/show.html.haml | 2 +- app/views/home/index.html.haml | 2 +- app/views/layouts/public.html.haml | 2 +- lib/mastodon/version.rb | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/javascript/flavours/glitch/features/ui/components/link_footer.js b/app/javascript/flavours/glitch/features/ui/components/link_footer.js index 4d2ba8e97..85ffade4a 100644 --- a/app/javascript/flavours/glitch/features/ui/components/link_footer.js +++ b/app/javascript/flavours/glitch/features/ui/components/link_footer.js @@ -48,20 +48,21 @@ class LinkFooter extends React.PureComponent { {invitesEnabled &&
  • ·
  • } {!!securityLink &&
  • ·
  • }
  • ·
  • -
  • ·
  • +
  • ·
  • ·
  • -
  • ·
  • -
  • ·
  • + //
  • ·
  • + //
  • ·
  • glitch-soc/mastodon (v{version}), - Mastodon: Mastodon }} + github: source code (v{version}), + Mastodon: glitch-soc/mastodon, + patreon: Patreon }} />

    diff --git a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js index 935c26be6..c79dd878a 100644 --- a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js @@ -141,8 +141,8 @@ const PageSix = ({ admin, domain }) => {

    {adminSection} -

    fork, Mastodon: Mastodon, github: GitHub }} />

    -

    }} />

    +

    fork, Mastodon: glitch-soc/mastodon, github: source code, patreon: Patreon }} />

    +

    }} />

    ); diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js index 3c4cff9f9..7db187a64 100644 --- a/app/javascript/mastodon/features/ui/components/link_footer.js +++ b/app/javascript/mastodon/features/ui/components/link_footer.js @@ -51,7 +51,7 @@ class LinkFooter extends React.PureComponent { {withHotkeys &&
  • ·
  • }
  • ·
  • ·
  • -
  • ·
  • +
  • ·
  • ·
  • ·
  • ·
  • diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml index 565c4ed59..1425dc1b5 100644 --- a/app/views/about/show.html.haml +++ b/app/views/about/show.html.haml @@ -38,7 +38,7 @@ %small= t('about.browse_public_posts') .directory__tag - = link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener noreferrer' do + = link_to '/apps/index.html', target: '_blank', rel: 'noopener noreferrer' do %h4 = fa_icon 'tablet fw' = t('about.get_apps') diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 568b23eff..851a19ace 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -12,4 +12,4 @@ = image_pack_tag 'logo.svg', alt: 'Mastodon' %div - = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps') + = t('errors.noscript_html', apps_path: '/apps/index.html') diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index eaa0437c2..9bab62566 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -51,6 +51,6 @@ %h4= t 'footer.more' %ul %li= link_to t('about.source_code'), Mastodon::Version.source_url - %li= link_to t('about.apps'), 'https://joinmastodon.org/apps' + %li= link_to t('about.apps'), 'https://metu.life/apps/index.html' = render template: 'layouts/application' diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 12581f3e1..6bb3e76b1 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -33,11 +33,11 @@ module Mastodon end def repository - ENV.fetch('GITHUB_REPOSITORY', 'glitch-soc/mastodon') + ENV.fetch('GITHUB_REPOSITORY', 'source code') end def source_base_url - ENV.fetch('SOURCE_BASE_URL', "https://github.com/#{repository}") + ENV.fetch('SOURCE_BASE_URL', "https://git.oyd.org.tr/MetuFSS/metu.life") end # specify git tag or commit hash here