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 <template #label>{{ i18n.ts.basicNotesBeforeCreateAccount }}</template> <template #suffix><i v-if="agreeNote" class="ph-check ph-bold ph-lg" style="color: var(--success)"></i></template> - <a href="https://git.joinsharkey.org/Sharkey/Sharkey/src/branch/stable/IMPORTANT_NOTES.md" class="_link" target="_blank">{{ i18n.ts.basicNotesBeforeCreateAccount }} <i class="ph-arrow-square-out ph-bold ph-lg"></i></a> + <a href="https://activitypub.software/TransFem-org/Sharkey/-/blob/stable/IMPORTANT_NOTES.md" class="_link" target="_blank">{{ i18n.ts.basicNotesBeforeCreateAccount }} <i class="ph-arrow-square-out ph-bold ph-lg"></i></a> <MkSwitch :modelValue="agreeNote" style="margin-top: 16px;" data-cy-signup-rules-notes-agree @update:modelValue="updateAgreeNote">{{ i18n.ts.agree }}</MkSwitch> </MkFolder> 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<InstanceType<typeof MkModal>>(); 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 <FormSection> <template #label>{{ i18n.ts._aboutMisskey.projectMembers }}</template> <div :class="$style.contributors" style="margin-bottom: 8px;"> - <a href="https://git.joinsharkey.org/Marie" target="_blank" :class="$style.contributor"> - <img src="https://git.joinsharkey.org/avatar/0d57abf583f5ed6cf37f47055a1e1aa4?size=512" :class="$style.contributorAvatar"> + <a href="https://activitypub.software/Marie" target="_blank" :class="$style.contributor"> + <img src="https://activitypub.software/uploads/-/system/user/avatar/2/avatar.png?width=128" :class="$style.contributorAvatar"> <span :class="$style.contributorUsername">@Marie</span> </a> - <a href="https://git.joinsharkey.org/Amelia" target="_blank" :class="$style.contributor"> - <img src="https://git.joinsharkey.org/avatars/0634b661b89d6e45137074b6ddcd0b9ffc4cf467f2188ec12416ec6f91bb9d42?size=512" :class="$style.contributorAvatar"> + <a href="https://activitypub.software/Amelia" target="_blank" :class="$style.contributor"> + <img src="https://activitypub.software/uploads/-/system/user/avatar/1/avatar.png?width=128" :class="$style.contributorAvatar"> <span :class="$style.contributorUsername">@Amelia</span> </a> </div> - <template #caption><MkLink url="https://git.joinsharkey.org/Sharkey/Sharkey/graph">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template> + <template #caption><MkLink url="https://activitypub.software/TransFem-org/Sharkey/-/graphs/develop">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template> </FormSection> <FormSection> <template #label>Misskey Contributors</template> 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 </MkKeyValue> </FormSplit> <FormLink v-if="instance.impressumUrl" :to="instance.impressumUrl" external> - <template #icon><i class="ti ti-user-shield"></i></template> + <template #icon><i class="ph-newspaper-clipping ph-bold ph-lg"></i></template> {{ i18n.ts.impressum }} </FormLink> <div class="_gaps_s"> <MkFolder v-if="instance.serverRules.length > 0"> <template #label> - <i class="ti ti-checkup-list"></i> + <i class="ph-list-checks ph-bold ph-lg"></i> {{ i18n.ts.serverRules }} </template> 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 </MkTextarea> <MkInput v-model="repositoryUrl" type="url"> - <template #prefix><i class="ti ti-link"></i></template> + <template #prefix><i class="ph-link ph-bold ph-lg"></i></template> <template #label>{{ i18n.ts.repositoryUrl }}</template> </MkInput> <MkInput v-model="feedbackUrl" type="url"> - <template #prefix><i class="ti ti-link"></i></template> + <template #prefix><i class="ph-link ph-bold ph-lg"></i></template> <template #label>{{ i18n.ts.feedbackUrl }}</template> </MkInput> 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 <MkInput v-model="repositoryUrl" type="url"> <template #label>{{ i18n.ts.repositoryUrl }}</template> - <template #prefix><i class="ti ti-link"></i></template> + <template #prefix><i class="ph-link ph-bold ph-lg"></i></template> <template #caption>{{ i18n.ts.repositoryUrlDescription }}</template> </MkInput>