Skip to content
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

WebUI: fix missing error icon #19610

Merged
merged 1 commit into from
Sep 18, 2023
Merged

Conversation

trim21
Copy link
Contributor

@trim21 trim21 commented Sep 17, 2023

Closes #18737.

tested locally, working as expected

image

@trim21 trim21 changed the title fix error torrent icon Fix web-ui error icon Sep 17, 2023
@luzpaz luzpaz added the WebUI WebUI-related issues/changes label Sep 17, 2023
@trim21 trim21 marked this pull request as ready for review September 17, 2023 12:13
@xavier2k6
Copy link
Member

you may have to change commit message....will leave that to others to decide but confirmed the issue & this PR fixes it.

@trim21
Copy link
Contributor Author

trim21 commented Sep 17, 2023

you may have to change commit message

Do you mean I need to rebase commit and re-write commit message? I'm not a very good at English, what commit message it should be?

@Chocobo1
Copy link
Member

Do you mean I need to rebase commit and re-write commit message? I'm not a very good at English, what commit message it should be?

Something like:

Fix missing error icon in WebUI

Closes #18737.

But don't worry about it. We can handle it when we merge it. Just leave it as is.

@trim21
Copy link
Contributor Author

trim21 commented Sep 17, 2023

Do you mean I need to rebase commit and re-write commit message? I'm not a very good at English, what commit message it should be?

Something like:

Fix missing error icon in WebUI

Closes #18737.

But don't worry about it. We can handle it when we merge it. Just leave it as is.

Yes, in my understanding github support editing merge commit or squash commit's commit message.

Thanks.

@Chocobo1 Chocobo1 changed the title Fix web-ui error icon Fix missing error icon in WebUI Sep 17, 2023
@luzpaz
Copy link
Contributor

luzpaz commented Sep 17, 2023

git commit --amend -m "Fix missing error icon in WebUI" -m "Closes #18737."
git push --force

@trim21
Copy link
Contributor Author

trim21 commented Sep 17, 2023

git commit --amend -m "Fix missing error icon in WebUI" -m "Closes #18737."
git push --force

This can be done be squashing merging...

I'd like not to touch any commits, so reviewers won't need to review them again.

@trim21
Copy link
Contributor Author

trim21 commented Sep 17, 2023

do i also need to create following PRs to backport this change to 4.x?i saw a branch 4.6 and 4.5

@glassez
Copy link
Member

glassez commented Sep 17, 2023

do i also need to create following PRs to backport this change to 4.x?i saw a branch 4.6 and 4.5

I will add it in #19582 after it is merged.

@glassez
Copy link
Member

glassez commented Sep 17, 2023

i saw a branch 4.6 and 4.5

4.5 is EOL, AFAIK.

@glassez glassez changed the title Fix missing error icon in WebUI WebUI: fix missing error icon Sep 18, 2023
@glassez glassez merged commit 30badbf into qbittorrent:master Sep 18, 2023
@glassez
Copy link
Member

glassez commented Sep 18, 2023

@trim21
Thank you!

glassez pushed a commit to glassez/qBittorrent that referenced this pull request Sep 18, 2023
@trim21 trim21 deleted the fix/error-icon branch September 18, 2023 13:54
glassez pushed a commit that referenced this pull request Oct 8, 2023
@glassez glassez added this to the 4.6.0 milestone Nov 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebUI WebUI-related issues/changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WebUI: missing image for error stateIcon
5 participants