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

Add cropping support when modifying the user/org/repo avatar #33498

Merged
merged 9 commits into from
Feb 6, 2025
Merged

Add cropping support when modifying the user/org/repo avatar #33498

merged 9 commits into from
Feb 6, 2025

Conversation

kerwin612
Copy link
Member

@kerwin612 kerwin612 commented Feb 5, 2025 •
edited by lunny
Loading

Fixed #33321

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 5, 2025
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 5, 2025
@github-actions github-actions bot added modifies/templates This PR modifies the template files modifies/frontend labels Feb 5, 2025
@techknowlogick techknowlogick added the topic/ui Change the appearance of the Gitea UI label Feb 5, 2025
@lunny lunny changed the title fixed #33321 Fix missed cropping function when modifying the user avatar and repo avatar Feb 5, 2025
@lunny lunny added the type/bug label Feb 5, 2025
@lunny lunny added this to the 1.24.0 milestone Feb 5, 2025
@lunny lunny added the backport/v1.23 This PR should be backported to Gitea 1.23 label Feb 5, 2025
@pull-request-size pull-request-size bot removed the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 5, 2025
@kerwin612
Copy link
Member Author

repo:
1738738520112

org:
1738738618619

@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 5, 2025
@wxiaoguang
Copy link
Contributor

When coding, need to do the best to avoid the unmaintainable code caused by copy-paste: 546f133

@wxiaoguang wxiaoguang added type/enhancement An improvement of existing functionality and removed backport/v1.23 This PR should be backported to Gitea 1.23 type/bug labels Feb 5, 2025
delvh
delvh previously requested changes Feb 5, 2025
View reviewed changes
web_src/js/features/admin/common.ts Outdated Show resolved Hide resolved
web_src/js/features/common-organization.ts Outdated Show resolved Hide resolved
web_src/js/features/user-settings.ts Outdated Show resolved Hide resolved
web_src/js/features/repo-settings.ts Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Feb 5, 2025
@GiteaBot GiteaBot removed the lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged label Feb 5, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 5, 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 Feb 5, 2025
@wxiaoguang
Copy link
Contributor

@delvh managed to introduce avatar-file-with-cropper again in f045e77

wxiaoguang
wxiaoguang approved these changes Feb 6, 2025
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If no more suggestions, I will vote my approval

@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 Feb 6, 2025
@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 6, 2025
@wxiaoguang wxiaoguang changed the title Fix missed cropping function when modifying the user avatar and repo avatar Add cropping support when modifying the user avatar and repo avatar Feb 6, 2025
@wxiaoguang wxiaoguang changed the title Add cropping support when modifying the user avatar and repo avatar Add cropping support when modifying the user/org/repo avatar Feb 6, 2025
@wxiaoguang wxiaoguang merged commit 40426ad into go-gitea:main Feb 6, 2025
26 checks passed
@wxiaoguang wxiaoguang deleted the fix_33321 branch February 6, 2025 13:07
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 6, 2025
LaoQi pushed a commit to LaoQi/gitea that referenced this pull request Feb 6, 2025
@kerwin612 @wxiaoguang @LaoQi
Add cropping support when modifying the user/org/repo avatar (go-gite…
6809453 
…a#33498)

Fixed go-gitea#33321

---------

Co-authored-by: wxiaoguang <[email protected]>
@kerwin612 kerwin612 mentioned this pull request Feb 7, 2025
Merged
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 7, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
34a84af 
* giteaofficial/main:
  refactor: decouple context from migration structs (go-gitea#33399)
  Move gitgraph from modules to services layer (go-gitea#33527)
  Add go wrapper around git diff-tree --raw -r -M (go-gitea#33369)
  [skip ci] Updated translations via Crowdin
  Update MAINTAINERS (go-gitea#33529)
  Add cropping support when modifying the user/org/repo avatar (go-gitea#33498)
  [skip ci] Updated translations via Crowdin
  Add alphabetical project sorting (go-gitea#33504)
  Refactor gitdiff test (go-gitea#33507)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@delvh delvh delvh 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/frontend modifies/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.

The administrator has no cropping function when modifying the user avatar
6 participants
@kerwin612 @wxiaoguang @delvh @lunny @techknowlogick @GiteaBot