From 8669125f37eb846ff6c962b6bc44226f680df380 Mon Sep 17 00:00:00 2001 From: Essem Date: Wed, 4 Sep 2024 16:06:15 -0500 Subject: [PATCH 1/6] chore: Remove esm from about page --- packages/frontend/src/pages/about-sharkey.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index c95db4011a..744e08f1f5 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -85,10 +85,6 @@ SPDX-License-Identifier: AGPL-3.0-only @dakkar - - - @esm - @supakaity From 25dec9a40f9be3449f4d8e9e8ab2dc20e459b0bf Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 6 Sep 2024 21:18:40 +0000 Subject: [PATCH 2/6] chore(readme): Update Donation button --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2407bee3f0..f9198c06c0 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ join the community - - donate + + donate --- From 9a7300489c3d153770496c10654f25390a8695aa Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 6 Sep 2024 21:25:38 +0000 Subject: [PATCH 3/6] chore: update donation links in backend and frontend --- packages/backend/src/boot/master.ts | 2 +- packages/frontend/src/components/MkDonation.vue | 2 +- packages/frontend/src/pages/about-sharkey.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index 583db240c5..3559816e96 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -44,7 +44,7 @@ function greet() { //#endregion 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(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`); diff --git a/packages/frontend/src/components/MkDonation.vue b/packages/frontend/src/components/MkDonation.vue index e96980dbbd..930f0f54cc 100644 --- a/packages/frontend/src/components/MkDonation.vue +++ b/packages/frontend/src/components/MkDonation.vue @@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.learnMore }} + {{ i18n.ts.learnMore }}
diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index 744e08f1f5..f772992f5d 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -53,7 +53,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original_sharkey }}) - + {{ i18n.ts._aboutMisskey.donate_sharkey }} From 19c90d8e9fe89558063ba106b4972292c0da786e Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 6 Sep 2024 21:27:35 +0000 Subject: [PATCH 4/6] chore: update Ko-Fi text to OpenCollective --- packages/frontend/src/pages/about-sharkey.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index f772992f5d..7720cff29e 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -56,7 +56,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._aboutMisskey.donate_sharkey }} - +
From ccc2cdb887bc74d1f6a721bc2d372b07bb2c1efa Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 6 Sep 2024 22:46:34 +0000 Subject: [PATCH 5/6] chore: update contributor section --- packages/frontend/src/pages/about-sharkey.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index 744e08f1f5..c79293249f 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -77,10 +77,6 @@ SPDX-License-Identifier: AGPL-3.0-only
- - - @Amelia - @dakkar @@ -105,6 +101,10 @@ SPDX-License-Identifier: AGPL-3.0-only @tess + + + @Marie +
From 14ce6f7cbb63a0d455931edc7733beaa33b92411 Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 6 Sep 2024 22:59:35 +0000 Subject: [PATCH 6/6] chore: add missing person --- packages/frontend/src/pages/about-sharkey.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index c79293249f..1197ea4114 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -105,6 +105,10 @@ SPDX-License-Identifier: AGPL-3.0-only @Marie + + + @Luna +