From d182402cfab631f301a3caff7a19b745f01434b3 Mon Sep 17 00:00:00 2001 From: Marie Date: Mon, 19 Feb 2024 18:46:42 +0100 Subject: [PATCH] fix: icons and update urls --- .gitmodules | 2 +- package.json | 2 +- packages/backend/src/server/web/views/base.pug | 2 +- packages/backend/src/server/web/views/error.pug | 2 +- .../frontend/src/components/MkSignupDialog.rules.vue | 2 +- packages/frontend/src/components/MkUpdated.vue | 2 +- packages/frontend/src/pages/about-sharkey.vue | 10 +++++----- packages/frontend/src/pages/about.vue | 4 ++-- packages/frontend/src/pages/admin/branding.vue | 4 ++-- packages/frontend/src/pages/admin/settings.vue | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitmodules b/.gitmodules index 92d3a87532..a3ca76cc96 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = https://github.com/misskey-dev/emojis.git [submodule "tossface-emojis"] path = tossface-emojis - url = https://git.joinsharkey.org/Sharkey/tossface-emojis.git + url = https://activitypub.software/TransFem-org/tossface-emojis.git diff --git a/package.json b/package.json index fb7f48d706..970eddd0e1 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "codename": "shonk", "repository": { "type": "git", - "url": "https://git.joinsharkey.org/Sharkey/Sharkey.git" + "url": "https://activitypub.software/TransFem-org/Sharkey.git" }, "packageManager": "pnpm@8.15.1", "workspaces": [ diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index c15e123a15..5fda2ee9ee 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -18,7 +18,7 @@ doctype html Thank you for using Sharkey! If you are reading this message... how about joining the development? - https://git.joinsharkey.org/Sharkey/Sharkey + https://activitypub.software/TransFem-org/Sharkey html diff --git a/packages/backend/src/server/web/views/error.pug b/packages/backend/src/server/web/views/error.pug index 00a2a72d7a..39b75abc4c 100644 --- a/packages/backend/src/server/web/views/error.pug +++ b/packages/backend/src/server/web/views/error.pug @@ -13,7 +13,7 @@ doctype html Thank you for using Sharkey! If you are reading this message... how about joining the development? - https://git.joinsharkey.org/Sharkey/Sharkey + https://activitypub.software/TransFem-org/Sharkey html diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue index 2f419a3a0e..18a9eeda23 100644 --- a/packages/frontend/src/components/MkSignupDialog.rules.vue +++ b/packages/frontend/src/components/MkSignupDialog.rules.vue @@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only - {{ i18n.ts.basicNotesBeforeCreateAccount }} + {{ i18n.ts.basicNotesBeforeCreateAccount }} {{ i18n.ts.agree }} diff --git a/packages/frontend/src/components/MkUpdated.vue b/packages/frontend/src/components/MkUpdated.vue index 9619bdf6dc..4fb0749931 100644 --- a/packages/frontend/src/components/MkUpdated.vue +++ b/packages/frontend/src/components/MkUpdated.vue @@ -27,7 +27,7 @@ const modal = shallowRef>(); const whatIsNew = () => { modal.value?.close(); - window.open(`https://git.joinsharkey.org/Sharkey/Sharkey/releases/tag/${version}`, '_blank'); + window.open(`https://activitypub.software/TransFem-org/Sharkey/-/releases/${version}`, '_blank'); }; onMounted(() => { diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index a58c5d9f99..d3efb23033 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -69,16 +69,16 @@ SPDX-License-Identifier: AGPL-3.0-only
- - + + @Marie - - + + @Amelia
- + diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index 8ad48e635d..f2aceada7d 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -58,13 +58,13 @@ SPDX-License-Identifier: AGPL-3.0-only - + {{ i18n.ts.impressum }}
diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue index beb11d2c9d..3b8fd3cd20 100644 --- a/packages/frontend/src/pages/admin/branding.vue +++ b/packages/frontend/src/pages/admin/branding.vue @@ -84,12 +84,12 @@ SPDX-License-Identifier: AGPL-3.0-only - + - + diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue index 88a1e33179..bd53554319 100644 --- a/packages/frontend/src/pages/admin/settings.vue +++ b/packages/frontend/src/pages/admin/settings.vue @@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only - +