Skip to content

(Update) Helpdesk category sort/icons & transaction text wrapping #4426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

AnabolicsAnonymous
Copy link
Contributor

There's a few changes in here, first I added the categories in the help desk index and added matching icons to the default categories and made the existing icons match the icon format in the config, I changed muted-text on the navy theme to make muted text more visible, I removed the htmlspecialchars from the comments quote button so that ampersands and quotations show up properly instead of HTML encoded text, and finally I added text wrapping to transactions on the staff's donation page since users were able to paste huge texts/tokens which would add a pesky horizontal scrollbar so you can view the donation cost and action buttons.

@HDVinnie
Copy link
Collaborator

This should be split into more than one PR.

@AnabolicsAnonymous
Copy link
Contributor Author

This should be split into more than one PR.

How do I do that now?

@Roardom
Copy link
Collaborator

Roardom commented Jan 17, 2025

You added all your commits to the 8.x.x branch so it makes this a bit harder. Basically, you want to create a new branch for every pr, based off of 8.x.x.

First, rename your 8.x.x branch to temp:

git switch 8.x.x
git branch -m temp

Then, add a remote for hdinnovations for upstream:

git remote add upstream https://github.com/HDInnovations/UNIT3D-Community-Edition.git

Then, re-pull 8.x.x:

git checkout -b 8.x.x upstream/8.x.x

Then, make a new feature branch off of 8.x.x for every pr to create:

git switch -c add-helpdesk-icons

Then, view a list of commits you made to temp:

git log --oneline -n 20 temp

Then, cherry pick the commits you already made to your temp branch that are relevant to that specific feature you're implementing.

git cherry-pick <hash of commits, each separated by a space>

Then, assuming you already have an origin remote (if not, do git remote add origin https://github.com/AnabolicsAnonymous/UNIT3D-Community-Edition.git), push each feature branch to github:

git push -u origin add-helpdesk-icons

Then, create a new pull request for every change.

Hope that helps

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants