woem.men/forkey
4
2
Fork 3
Code Issues 34 Pull requests 16 Projects Releases Packages Wiki Activity Actions

Pickable MFM search engine #54

Open
leah wants to merge 1 commit from cherrypick/choosable-search-engine into main
pull from: cherrypick/choosable-search-engine
merge into: woem.men:main
Conversation 0 Commits 1 Files changed 8 +78 -5
leah commented 2025-01-19 22:22:53 +00:00
Owner
Copy link

image

You can pick from many search engines or add your own.

picked from: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/547

![image](/attachments/d9b3a368-7ae7-476a-80d7-8ae405f5948f) You can pick from many search engines or add your own. picked from: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/547
image.png
25 KiB
leah added 1 commit 2025-01-19 22:22:53 +00:00
add custom search engines to google mfm
All checks were successful
Lint / pnpm_install (pull_request) Successful in 2m11s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 2m49s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 4m57s
Details
Lint / lint (frontend) (pull_request) Successful in 9m52s
Details
Lint / lint (backend) (pull_request) Successful in 11m39s
Details
Lint / lint (misskey-js) (pull_request) Successful in 4m9s
Details
Lint / lint (sw) (pull_request) Successful in 7m51s
Details
Lint / typecheck (backend) (pull_request) Successful in 4m58s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 2h11m8s
Details
e2e0e9d956
All checks were successful
Lint / pnpm_install (pull_request) Successful in 2m11s
Details
Test (production install and build) / production (22.x) (pull_request) Successful in 2m49s
Details
Test (frontend) / vitest (22.x) (pull_request) Successful in 4m57s
Details
Lint / lint (frontend) (pull_request) Successful in 9m52s
Details
Lint / lint (backend) (pull_request) Successful in 11m39s
Details
Lint / lint (misskey-js) (pull_request) Successful in 4m9s
Details
Lint / lint (sw) (pull_request) Successful in 7m51s
Details
Lint / typecheck (backend) (pull_request) Successful in 4m58s
Details
Lint / typecheck (misskey-js) (pull_request) Successful in 2h11m8s
Details
This pull request has changes conflicting with the target branch.
  • locales/en-US.yml
  • locales/index.d.ts
  • locales/ja-JP.yml
  • packages/frontend/src/pages/settings/general.vue
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin cherrypick/choosable-search-engine:cherrypick/choosable-search-engine
git checkout cherrypick/choosable-search-engine

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/choosable-search-engine
git checkout cherrypick/choosable-search-engine
git rebase main
git checkout main
git merge --ff-only cherrypick/choosable-search-engine
git checkout cherrypick/choosable-search-engine
git rebase main
git checkout main
git merge --no-ff cherrypick/choosable-search-engine
git checkout main
git merge --squash cherrypick/choosable-search-engine
git checkout main
git merge --ff-only cherrypick/choosable-search-engine
git checkout main
git merge cherrypick/choosable-search-engine
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
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#54
No description provided.
Delete branch "cherrypick/choosable-search-engine"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?