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

Adding button to link accounts from user settings #19792

Merged
merged 4 commits into from
May 29, 2022
Merged

Adding button to link accounts from user settings #19792

merged 4 commits into from
May 29, 2022

Conversation

Mai-Lapyst
Copy link
Contributor

This PR closes #17004 by adding an "Link Account" button to the list of linked accounts in the user's settings under "Security".

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 24, 2022
@lunny lunny added the topic/ui Change the appearance of the Gitea UI label May 24, 2022
@6543 6543 added the type/enhancement An improvement of existing functionality label May 24, 2022
@6543 6543 added this to the 1.17.0 milestone May 24, 2022
@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 May 24, 2022
wxiaoguang
wxiaoguang reviewed May 25, 2022
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Generally L-G-T-M. Some CSS/HTML suggestions.

ps: you could also allow Edit by maintainers for your PR, then maintainers can update / merge it easily. If the PR can not be edited by maintainers, you would do merge from main every time if main branch changes.

templates/user/settings/security/accountlinks.tmpl Outdated Show resolved Hide resolved
templates/user/settings/security/accountlinks.tmpl Outdated Show resolved Hide resolved
templates/user/settings/security/accountlinks.tmpl Outdated Show resolved Hide resolved
@Gusted
Copy link
Contributor

Gusted commented May 26, 2022

I think this is rather a kind/feature than kind/enchantment.

@Gusted Gusted added type/feature Completely new functionality. Can only be merged if feature freeze is not active. and removed type/enhancement An improvement of existing functionality labels May 26, 2022
@Mai-Lapyst Mai-Lapyst force-pushed the link-accounts-from-user-settings branch from fdfb9b3 to 34115f4 Compare May 26, 2022 20:14
@Mai-Lapyst
Copy link
Contributor Author

Generally L-G-T-M. Some CSS/HTML suggestions.

@wxiaoguang have added your suggestions and rebased the branch against master

@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 May 28, 2022
@6543 6543 merged commit 4698a1e into go-gitea:main May 29, 2022
@wxiaoguang wxiaoguang mentioned this pull request May 29, 2022
Merged
@wxiaoguang
Copy link
Contributor

Fix i18n for Link Account button, re-format tmpl #19835

zjjhot added a commit to zjjhot/gitea that referenced this pull request May 29, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
99bbcfa 
* giteaofficial/main:
  Fix i18n for Link Account button, re-format tmpl (go-gitea#19835)
  [skip ci] Updated translations via Crowdin
  Adding button to link accounts from user settings (go-gitea#19792)
  fix(telegram): fix link bot to release tag (go-gitea#19830)
  Fix raw endpoint PDF file headers (go-gitea#19825)
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this pull request Aug 24, 2022
@Mai-Lapyst @AbdulrhmnGhanem
Adding button to link accounts from user settings (go-gitea#19792)
5783962 
* Adding button to link accounts from user settings

* Only display button to link user accounts when at least one OAuth2 provider is active
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
@Mai-Lapyst Mai-Lapyst deleted the link-accounts-from-user-settings branch February 10, 2024 15:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@zeripath zeripath zeripath approved these changes

@6543 6543 6543 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. topic/ui Change the appearance of the Gitea UI type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.17.0
Development

Successfully merging this pull request may close these issues.

Link Oauth2 from User-Settings-Pannel
7 participants
@Mai-Lapyst @Gusted @wxiaoguang @zeripath @6543 @lunny @GiteaBot