heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch Sharkey:develop into develop

Browse source
This commit is contained in:
piuvas silly 2024-09-12 22:16:41 +00:00
commit bc243c8946
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -16,8 +16,8 @@
<a href="https://discord.gg/6VgKmEqHNk"> <a href="https://discord.gg/6VgKmEqHNk">
<img src="https://custom-icon-badges.herokuapp.com/badge/join_the-community-5865F2?logoColor=5865F2&style=for-the-badge&logo=discord&labelColor=363B40" alt="join the community"/></a> <img src="https://custom-icon-badges.herokuapp.com/badge/join_the-community-5865F2?logoColor=5865F2&style=for-the-badge&logo=discord&labelColor=363B40" alt="join the community"/></a>
<a href="https://ko-fi.com/transfem"> <a href="https://opencollective.com/sharkey">
<img src="https://custom-icon-badges.herokuapp.com/badge/donate-F96854?logoColor=F96854&style=for-the-badge&logo=kofi&labelColor=363B40" alt="donate"/></a> <img src="https://custom-icon-badges.herokuapp.com/badge/donate-81ACF4?logoColor=81ACF4&style=for-the-badge&logo=opencollective&labelColor=363B40" alt="donate"/></a>
--- ---

2
packages/backend/src/boot/master.ts
View file

@ -44,7 +44,7 @@ function greet() {
//#endregion //#endregion
console.log(' Sharkey is an open-source decentralized microblogging platform.'); console.log(' Sharkey is an open-source decentralized microblogging platform.');
console.log(chalk.rgb(255, 136, 0)(' If you like Sharkey, please donate to support development. https://ko-fi.com/transfem')); console.log(chalk.rgb(255, 136, 0)(' If you like Sharkey, please donate to support development. https://opencollective.com/sharkey'));
console.log(''); console.log('');
console.log(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`); console.log(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`);

2
packages/frontend/src/components/MkDonation.vue
View file

@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template> </template>
</I18n> </I18n>
<div style="margin-top: 0.2em;"> <div style="margin-top: 0.2em;">
<MkLink target="_blank" url="https://ko-fi.com/transfem">{{ i18n.ts.learnMore }}</MkLink> <MkLink target="_blank" url="https://opencollective.com/sharkey">{{ i18n.ts.learnMore }}</MkLink>
</div> </div>
</div> </div>
<div v-if="instance.donationUrl" :class="$style.text"> <div v-if="instance.donationUrl" :class="$style.text">

20
packages/frontend/src/pages/about-sharkey.vue
View file

@ -53,10 +53,10 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original_sharkey }}) {{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original_sharkey }})
<template #suffix>GitLab</template> <template #suffix>GitLab</template>
</FormLink> </FormLink>
<FormLink to="https://ko-fi.com/transfem" external> <FormLink to="https://opencollective.com/sharkey" external>
<template #icon><i class="ph-piggy-bank ph-bold ph-lg"></i></template> <template #icon><i class="ph-piggy-bank ph-bold ph-lg"></i></template>
{{ i18n.ts._aboutMisskey.donate_sharkey }} {{ i18n.ts._aboutMisskey.donate_sharkey }}
<template #suffix>Ko-Fi</template> <template #suffix>OpenCollective</template>
</FormLink> </FormLink>
</div> </div>
</FormSection> </FormSection>
@ -77,18 +77,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<FormSection> <FormSection>
<template #label>{{ i18n.ts._aboutMisskey.projectMembers }}</template> <template #label>{{ i18n.ts._aboutMisskey.projectMembers }}</template>
<div :class="$style.contributors" style="margin-bottom: 8px;"> <div :class="$style.contributors" style="margin-bottom: 8px;">
<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>
<a href="https://activitypub.software/dakkar" target="_blank" :class="$style.contributor"> <a href="https://activitypub.software/dakkar" target="_blank" :class="$style.contributor">
<img src="https://secure.gravatar.com/avatar/c71b315eed7c63ff94c42b1b3e8dbad1?s=192&d=identicon" :class="$style.contributorAvatar"> <img src="https://secure.gravatar.com/avatar/c71b315eed7c63ff94c42b1b3e8dbad1?s=192&d=identicon" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@dakkar</span> <span :class="$style.contributorUsername">@dakkar</span>
</a> </a>
<a href="https://activitypub.software/esm" target="_blank" :class="$style.contributor">
<img src="https://secure.gravatar.com/avatar/00fd054610e2a9dcf97a2aa661b168d0?s=192&d=identicon" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@esm</span>
</a>
<a href="https://activitypub.software/supakaity" target="_blank" :class="$style.contributor"> <a href="https://activitypub.software/supakaity" target="_blank" :class="$style.contributor">
<img src="https://activitypub.software/uploads/-/system/user/avatar/65/avatar.png?width=40" :class="$style.contributorAvatar"> <img src="https://activitypub.software/uploads/-/system/user/avatar/65/avatar.png?width=40" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@supakaity</span> <span :class="$style.contributorUsername">@supakaity</span>
@ -109,6 +101,14 @@ SPDX-License-Identifier: AGPL-3.0-only
<img src="https://activitypub.software/uploads/-/system/user/avatar/132/avatar.png?width=128" :class="$style.contributorAvatar"> <img src="https://activitypub.software/uploads/-/system/user/avatar/132/avatar.png?width=128" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@tess</span> <span :class="$style.contributorUsername">@tess</span>
</a> </a>
<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://activitypub.software/luna" target="_blank" :class="$style.contributor">
<img src="https://secure.gravatar.com/avatar/4faf37df86a3d93a6c19ed6abf8588eade4efb837410dbbc53021b4fd12eaae7?s=80&d=identicon" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@Luna</span>
</a>
</div> </div>
<template #description><MkLink url="https://activitypub.software/TransFem-org/Sharkey/-/graphs/develop">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template> <template #description><MkLink url="https://activitypub.software/TransFem-org/Sharkey/-/graphs/develop">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
</FormSection> </FormSection>