Cherrypick listenbrainz #52

Open

leah wants to merge 13 commits from cherrypick/listenbrainz into main

pull from: cherrypick/listenbrainz

merge into: woem.men:main

woem.men:main

woem.men:fix/add-missing-translations

woem.men:feature/mark-incoming-cwed-post-media-as-sensitive

woem.men:mute-fix

woem.men:cherrypick/small-and-center

woem.men:feature/post-languages

woem.men:feature/custom-email-template

woem.men:cherrypick/refresh-polls

woem.men:feature/alt-text-achivements

woem.men:cherrypick/choosable-search-engine

woem.men:feature/indicate-block-mute

woem.men:cherrypick/wildcard-antenna-accts

woem.men:fix/scroll-alt-text

woem.men:feature/alt-text-badge

woem.men:feature/friendly-captcha

woem.men:forkey-rebrand

woem.men:bug/workflows

woem.men:feature/approval

woem.men:feature/meta-mfm

woem.men:feature/note-editing

Conversation 0 Commits 13 Files changed 18 +249 -3

leah commented 2025-01-19 20:09:39 +00:00

Owner

Copy link

Cherrypick listenbrainz + added a description to the settings so users are a bit less confused

Pulled from: https://github.com/transfem-org/Sharkey/pull/1

Cherrypick listenbrainz + added a description to the settings so users are a bit less confused  Pulled from: https://github.com/transfem-org/Sharkey/pull/1

image.png

82 KiB

leah added 1 commit 2025-01-19 20:09:40 +00:00

add listenbrainz from sharkey 85818f1610

leah added 1 commit 2025-01-19 21:44:13 +00:00

Merge branch 'main' into cherrypick/listenbrainz 0d4f11c365

leah added 2 commits 2025-02-03 15:13:27 +00:00

fix linter problems c2be49c68d

Merge branch 'cherrypick/listenbrainz' of https://git.woem.men/woem.men/forkey into cherrypick/listenbrainz 6933b43e71

leah added 1 commit 2025-02-03 17:16:11 +00:00

please linter ;-; 888326a4e6

leah added 1 commit 2025-02-04 13:18:05 +00:00

Add listenbrainz field to backend test 94918b8f95

leah added 1 commit 2025-02-04 13:18:25 +00:00

Merge branch 'main' into cherrypick/listenbrainz 6d4908e5da

leah added 1 commit 2025-02-04 13:42:06 +00:00

removed listenbrainz from signup response test (was a mistake) f65e3bdf88

leah added 1 commit 2025-02-04 14:17:50 +00:00

maybe fixed listenbrainz? 5de77871ec

leah added 1 commit 2025-02-04 14:40:54 +00:00

please 0c7922edbc

leah added 1 commit 2025-02-04 15:00:20 +00:00

small update to home 0a0edca5c6

leah added 1 commit 2025-02-04 15:44:56 +00:00

now? d56abc802a

leah added 1 commit 2025-02-04 16:02:25 +00:00

fix? 8723cffd45

All checks were successful

Hide all checks

Lint / pnpm_install (pull_request) Successful in 30s

Details

API report (misskey.js) / report (pull_request) Successful in 43s

Details

Test (misskey.js) / test (22.x) (pull_request) Successful in 58s

Details

Test (frontend) / vitest (22.x) (pull_request) Successful in 1m31s

Details

Test (production install and build) / production (22.x) (pull_request) Successful in 1m3s

Details

Lint / lint (backend) (pull_request) Successful in 1m3s

Details

Lint / lint (misskey-js) (pull_request) Successful in 34s

Details

Test (backend) / validate-api-json (22.x) (pull_request) Successful in 1m31s

Details

Lint / lint (sw) (pull_request) Successful in 31s

Details

Test (backend) / unit (22.x) (pull_request) Successful in 2m41s

Details

Lint / typecheck (misskey-js) (pull_request) Successful in 33s

Details

Lint / typecheck (backend) (pull_request) Successful in 1m25s

Details

Test (backend) / e2e (22.x) (pull_request) Successful in 6m31s

Details

Lint / lint (frontend) (pull_request) Successful in 7m32s

Details

This pull request has changes conflicting with the target branch.

• packages/backend/src/core/activitypub/misc/contexts.ts

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin cherrypick/listenbrainz:cherrypick/listenbrainz

git checkout cherrypick/listenbrainz

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main

git merge --no-ff cherrypick/listenbrainz

git checkout cherrypick/listenbrainz

git rebase main

git checkout main

git merge --ff-only cherrypick/listenbrainz

git checkout cherrypick/listenbrainz

git rebase main

git checkout main

git merge --no-ff cherrypick/listenbrainz

git checkout main

git merge --squash cherrypick/listenbrainz

git checkout main

git merge --ff-only cherrypick/listenbrainz

git checkout main

git merge cherrypick/listenbrainz

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

customization

Change something to be more suitable for forkey

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

feature parity

Another fork has this feature, and it should be pulled into this fork.

  

help wanted

Need some help

  

high priority

  

invalid

Something is wrong

  

low priority

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

bug

customization

duplicate

enhancement

feature parity

help wanted

high priority

invalid

low priority

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: woem.men/forkey#52

No description provided.