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.

Sign up for GitHub

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

Jump to bottom

Fix "stop time tracking button" on navbar (#33084) #33300

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Fix "stop time tracking button" on navbar (#33084) #33300

merged 2 commits into from
Jan 16, 2025

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jan 16, 2025 •
edited
Loading

Backport #33084 (no conflict)
Fix #33299, and remove incorrect translations

@wxiaoguang
Fix "stop time tracking button" on navbar (go-gitea#33084)
0ea9e29 
Fix go-gitea#33083

By the way (something I was working on):

1. relax color/background-color for more markup elements
2. fix a command line sentence error
@GiteaBot GiteaBot added this to the 1.23.2 milestone Jan 16, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 16, 2025
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 16, 2025
@github-actions github-actions bot added modifies/go Pull requests that update Go code modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin modifies/templates This PR modifies the template files labels Jan 16, 2025
@wxiaoguang wxiaoguang mentioned this pull request Jan 16, 2025
Closed
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 16, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 16, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 16, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 16, 2025
@lunny lunny merged commit 52d2988 into go-gitea:release/v1.23 Jan 16, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 16, 2025
@lunny lunny mentioned this pull request Jan 20, 2025
Closed
@wxiaoguang wxiaoguang deleted the backport-stopwatch branch January 21, 2025 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files modifies/translation size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.2
Development

Successfully merging this pull request may close these issues.
4 participants
@wxiaoguang @lunny @silverwind @GiteaBot