From e8d4ed26708e7f09332719ae6398fc63f6afb3e7 Mon Sep 17 00:00:00 2001 From: Devin Bileck <603793+devinbileck@users.noreply.github.com> Date: Wed, 20 Feb 2019 14:49:57 -0800 Subject: [PATCH] Use URL redirects to GitHub content URL redirects for downloads, source code, roles; all of which currently go to GitHub. See bisq-network/bisq#2429 --- .../model/governance/BondedRoleType.java | 32 +++++++++---------- .../bisq/desktop/main/overlays/Overlay.java | 4 +-- .../windows/downloadupdate/BisqInstaller.java | 2 +- .../main/settings/about/AboutView.java | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/BondedRoleType.java b/core/src/main/java/bisq/core/dao/state/model/governance/BondedRoleType.java index d6df4dacfd..1d9568b0f2 100644 --- a/core/src/main/java/bisq/core/dao/state/model/governance/BondedRoleType.java +++ b/core/src/main/java/bisq/core/dao/state/model/governance/BondedRoleType.java @@ -31,29 +31,29 @@ import lombok.Getter; */ public enum BondedRoleType { // admins - GITHUB_ADMIN(50_000, 60, "https://github.com/bisq-network/roles/issues/16", true), - FORUM_ADMIN(20_000, 60, "https://github.com/bisq-network/roles/issues/19", true), - TWITTER_ADMIN(20_000, 60, "https://github.com/bisq-network/roles/issues/21", true), - ROCKET_CHAT_ADMIN(20_000, 60, "https://github.com/bisq-network/roles/issues/79", true), - YOUTUBE_ADMIN(5_000, 60, "https://github.com/bisq-network/roles/issues/56", true), + GITHUB_ADMIN(50_000, 60, "https://bisq.network/roles/16", true), + FORUM_ADMIN(20_000, 60, "https://bisq.network/roles/19", true), + TWITTER_ADMIN(20_000, 60, "https://bisq.network/roles/21", true), + ROCKET_CHAT_ADMIN(20_000, 60, "https://bisq.network/roles/79", true), + YOUTUBE_ADMIN(5_000, 60, "https://bisq.network/roles/56", true), // maintainers - BISQ_MAINTAINER(50_000, 60, "https://github.com/bisq-network/roles/issues/63", true), + BISQ_MAINTAINER(50_000, 60, "https://bisq.network/roles/63", true), // operators - WEBSITE_OPERATOR(50_000, 60, "https://github.com/bisq-network/roles/issues/12", true), - FORUM_OPERATOR(50_000, 60, "https://github.com/bisq-network/roles/issues/19", true), - SEED_NODE_OPERATOR(20_000, 60, "https://github.com/bisq-network/roles/issues/15", true), - PRICE_NODE_OPERATOR(20_000, 60, "https://github.com/bisq-network/roles/issues/14", true), - BTC_NODE_OPERATOR(5_000, 60, "https://github.com/bisq-network/roles/issues/67", true), - MARKETS_OPERATOR(20_000, 60, "https://github.com/bisq-network/roles/issues/9", true), - BSQ_EXPLORER_OPERATOR(20_000, 60, "https://github.com/bisq-network/roles/issues/11", true), + WEBSITE_OPERATOR(50_000, 60, "https://bisq.network/roles/12", true), + FORUM_OPERATOR(50_000, 60, "https://bisq.network/roles/19", true), + SEED_NODE_OPERATOR(20_000, 60, "https://bisq.network/roles/15", true), + PRICE_NODE_OPERATOR(20_000, 60, "https://bisq.network/roles/14", true), + BTC_NODE_OPERATOR(5_000, 60, "https://bisq.network/roles/67", true), + MARKETS_OPERATOR(20_000, 60, "https://bisq.network/roles/9", true), + BSQ_EXPLORER_OPERATOR(20_000, 60, "https://bisq.network/roles/11", true), // other - DOMAIN_NAME_HOLDER(50_000, 60, "https://github.com/bisq-network/roles/issues/77", false), - DNS_ADMIN(50_000, 60, "https://github.com/bisq-network/roles/issues/18", false), + DOMAIN_NAME_HOLDER(50_000, 60, "https://bisq.network/roles/77", false), + DNS_ADMIN(50_000, 60, "https://bisq.network/roles/18", false), MEDIATOR(10_000, 60, "N/A", true), - ARBITRATOR(200_000, 60, "https://github.com/bisq-network/roles/issues/13", true); + ARBITRATOR(200_000, 60, "https://bisq.network/roles/13", true); // Satoshi value of BSQ bond diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java b/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java index e8b175c9bf..c784f895b3 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/Overlay.java @@ -374,7 +374,7 @@ public abstract class Overlay { public T useReportBugButton() { this.closeButtonText = Res.get("shared.reportBug"); - this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bisq-network/bisq-desktop/issues")); + this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://bisq.network/source/bisq/issues")); //noinspection unchecked return (T) this; } @@ -826,7 +826,7 @@ public abstract class Overlay { gitHubButton.setOnAction(event -> { if (message != null) Utilities.copyToClipboard(message); - GUIUtil.openWebPage("https://github.com/bisq-network/bisq-desktop/issues"); + GUIUtil.openWebPage("https://bisq.network/source/bisq/issues"); hide(); }); } diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java index 62d03e7f9b..1c00c55a20 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/downloadupdate/BisqInstaller.java @@ -60,7 +60,7 @@ public class BisqInstaller { private static final String FINGER_PRINT_CHRIS_BEAMS = "5BC5ED73"; private static final String FINGER_PRINT_CHRISTOPH_ATTENEDER = "29CDFD3B"; private static final String PUB_KEY_HOSTING_URL = "https://bisq.network/pubkey/"; - private static final String DOWNLOAD_HOST_URL = "https://github.com/bisq-network/exchange/releases/download/"; + private static final String DOWNLOAD_HOST_URL = "https://bisq.network/downloads/"; public boolean isSupportedOS() { return Utilities.isOSX() || Utilities.isWindows() || Utilities.isLinux(); diff --git a/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java b/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java index 57276af564..bda8cece3e 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java +++ b/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java @@ -60,9 +60,9 @@ public class AboutView extends ActivatableViewAndModel { GridPane.setHalignment(label, HPos.LEFT); HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.web"), "https://bisq.network"); GridPane.setColumnSpan(hyperlinkWithIcon, 2); - hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.code"), "https://github.com/bisq-network/exchange"); + hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.code"), "https://bisq.network/source/bisq"); GridPane.setColumnSpan(hyperlinkWithIcon, 2); - hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://github.com/bisq-network/exchange/blob/master/LICENSE"); + hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://bisq.network/source/bisq/blob/master/LICENSE"); GridPane.setColumnSpan(hyperlinkWithIcon, 2); titledGroupBg = addTitledGroupBg(root, ++gridRow, 3, Res.get("setting.about.support"), Layout.GROUP_DISTANCE);