Menagerie/Menagerie_Cookbook
3
0
Fork 1
Code Issues 2 Pull requests 1 Projects Releases 22 Packages Wiki Activity Actions

Proteins #11

Open
Azea_Avenbright wants to merge 20 commits from Proteins into master
pull from: Proteins
merge into: Menagerie:master
Conversation 0 Commits 20 Files changed 59 +985 -539
Azea_Avenbright commented 2025-04-01 13:51:16 -04:00
Owner
Copy link
  • Ripped Settings out into a Settings Manager.
  • Added Protein Icons to recipes to show which proteins we recommend
    • Added tooltips to icons to display their content description
  • Added the ability to favourite recipes!
  • Added tips to the home screen!
  • Added setting to disable animations
  • Added A home button to take you back to the recipe list
  • Replaced the back to recipes button with a "Previous" button
- Ripped Settings out into a Settings Manager. - Added Protein Icons to recipes to show which proteins we recommend - Added tooltips to icons to display their content description - Added the ability to favourite recipes! - Added tips to the home screen! - Added setting to disable animations - Added A home button to take you back to the recipe list - Replaced the back to recipes button with a "Previous" button -
Azea_Avenbright added 15 commits 2025-04-01 13:51:16 -04:00
Azea_Avenbright added 1 commit 2025-04-01 13:51:30 -04:00
Azea_Avenbright added 2 commits 2025-04-01 13:52:17 -04:00
Azea_Avenbright added 1 commit 2025-04-01 13:53:24 -04:00
Azea_Avenbright added 1 commit 2025-04-01 13:57:38 -04:00
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin Proteins:Proteins
git checkout Proteins

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 master
git merge --no-ff Proteins
git checkout Proteins
git rebase master
git checkout master
git merge --ff-only Proteins
git checkout Proteins
git rebase master
git checkout master
git merge --no-ff Proteins
git checkout master
git merge --squash Proteins
git checkout master
git merge --ff-only Proteins
git checkout master
git merge Proteins
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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: Menagerie/Menagerie_Cookbook#11
No description provided.
Delete branch "Proteins"

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?