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

Display all user types and org types on admin management UI #27050

Merged
merged 6 commits into from Sep 14, 2023
Merged

Display all user types and org types on admin management UI #27050

merged 6 commits into from Sep 14, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Sep 13, 2023 •
edited

Follow #24026

图片

@lunny lunny added type/enhancement An improvement of existing functionality topic/ui Change the appearance of the Gitea UI labels Sep 13, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 13, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 13, 2023
@lunny lunny added this to the 1.21.0 milestone Sep 13, 2023
@github-actions github-actions bot removed the topic/ui Change the appearance of the Gitea UI label Sep 13, 2023
@puni9869
Copy link
Member

puni9869 commented Sep 13, 2023 •
edited

image

  1. Can these label be a lil small in size they will take much space once username is big. Thats why.
  2. What is the difference in admin.reserved and admin type.

@lunny
Copy link
Member Author

lunny commented Sep 13, 2023

image

1. Can these label be a lil small in size  they will take much space once username is big. Thats why.

2. What is the difference in `admin.reserved` and `admin` type.

Changed to small size label.

delvh
delvh approved these changes Sep 13, 2023
View reviewed changes
templates/admin/user/list.tmpl Outdated Show resolved Hide resolved
templates/admin/org/list.tmpl Outdated Show resolved Hide resolved
@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 Sep 13, 2023
@techknowlogick @delvh
Apply suggestions from code review
105b254 
Co-authored-by: delvh <dev.lh@web.de>
@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 Sep 14, 2023
@KN4CK3R KN4CK3R enabled auto-merge (squash) September 14, 2023 05:58
@KN4CK3R KN4CK3R merged commit 198a9ca into go-gitea:main Sep 14, 2023
26 checks passed
@lunny lunny deleted the lunny/list_all_users_admin branch September 14, 2023 06:54
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 14, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
78fb7f3 
* giteaofficial/main:
  Display all user types and org types on admin management UI (go-gitea#27050)
  Apply lng2020 to maintainers (go-gitea#27068)
  Fix incorrect default branch label while switching between branches (go-gitea#27053)
  set version in snapcraft yaml
  Replace 'userxx' with 'orgxx' in all test files when the user type is org  (go-gitea#27052)
  [skip ci] Updated translations via Crowdin
  Load reviewer before sending notification (go-gitea#27063)
  bump all nightly builds to 16gb
  Show the repo count in code tab on both user profile and org page. (go-gitea#27048)
  Fix Fomantic's line-height causing vertical scrollbars to appear (go-gitea#26961)
  Dashboard context dropdown position fix on landing page in mobile view. (go-gitea#27047)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@KN4CK3R KN4CK3R KN4CK3R 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lunny @puni9869 @KN4CK3R @delvh @GiteaBot @techknowlogick