summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmelia Yukii <amelia.yukii@shourai.de>2024-03-04 20:35:57 +0000
committerAmelia Yukii <amelia.yukii@shourai.de>2024-03-04 20:35:57 +0000
commit4c69cbcd2bc6b5114f7f927411be2fbbcd54d979 (patch)
tree8cc04b583dbcb176951d5e19ae7e1ffa3bae2b45
parentmerge: fix repo + feedback URLs for Firefish / IceShrimp (!450) (diff)
parentupdate list of project members (diff)
downloadsharkey-4c69cbcd2bc6b5114f7f927411be2fbbcd54d979.tar.gz
sharkey-4c69cbcd2bc6b5114f7f927411be2fbbcd54d979.tar.bz2
sharkey-4c69cbcd2bc6b5114f7f927411be2fbbcd54d979.zip
merge: update list of project members (!452)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/452 Approved-by: Amelia Yukii <amelia.yukii@shourai.de> Approved-by: Leah <kevinlukej@gmail.com>
-rw-r--r--packages/frontend/src/index.html2
-rw-r--r--packages/frontend/src/pages/about-sharkey.vue28
2 files changed, 25 insertions, 5 deletions
diff --git a/packages/frontend/src/index.html b/packages/frontend/src/index.html
index ecd4f44713..54059bfaf4 100644
--- a/packages/frontend/src/index.html
+++ b/packages/frontend/src/index.html
@@ -20,7 +20,7 @@
worker-src 'self';
script-src 'self' 'unsafe-eval' https://*.hcaptcha.com https://challenges.cloudflare.com;
style-src 'self' 'unsafe-inline';
- img-src 'self' data: blob: www.google.com xn--931a.moe launcher.moe localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
+ img-src 'self' data: blob: www.google.com xn--931a.moe launcher.moe localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 activitypub.software secure.gravatar.com avatars.githubusercontent.com;
media-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000;
connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com;
frame-src *;"
diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue
index 30788e24ce..1bfd90c8f7 100644
--- a/packages/frontend/src/pages/about-sharkey.vue
+++ b/packages/frontend/src/pages/about-sharkey.vue
@@ -77,14 +77,34 @@ 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://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/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">
+ <img src="https://secure.gravatar.com/avatar/c71b315eed7c63ff94c42b1b3e8dbad1?s=192&d=identicon" :class="$style.contributorAvatar">
+ <span :class="$style.contributorUsername">@dakkar</span>
+ </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">
+ <img src="https://activitypub.software/uploads/-/system/user/avatar/65/avatar.png?width=40" :class="$style.contributorAvatar">
+ <span :class="$style.contributorUsername">@supakaity</span>
+ </a>
+ <a href="https://activitypub.software/julia" target="_blank" :class="$style.contributor">
+ <img src="https://activitypub.software/uploads/-/system/user/avatar/41/avatar.png?width=40" :class="$style.contributorAvatar">
+ <span :class="$style.contributorUsername">@julia</span>
+ </a>
+ <a href="https://activitypub.software/Leah" target="_blank" :class="$style.contributor">
+ <img src="https://secure.gravatar.com/avatar/3b35b921b284ccfd1fe348508f6f705b?s=80&d=identicon" :class="$style.contributorAvatar">
+ <span :class="$style.contributorUsername">@Leah</span>
+ </a>
+ <a href="https://activitypub.software/fEmber" target="_blank" :class="$style.contributor">
+ <img src="https://secure.gravatar.com/avatar/ea0ea6451fdb74311efad369bdce018e?s=80&d=identicon" :class="$style.contributorAvatar">
+ <span :class="$style.contributorUsername">@fEmber</span>
+ </a>
</div>
<template #caption><MkLink url="https://activitypub.software/TransFem-org/Sharkey/-/graphs/develop">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
</FormSection>