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: Add loading and countdown status to the verification code sending button #384

Merged
merged 1 commit into from
Dec 23, 2021
Merged

fix: Add loading and countdown status to the verification code sending button #384

merged 1 commit into from
Dec 23, 2021

Conversation

jianmaikj
Copy link
Contributor

@jianmaikj jianmaikj commented Dec 21, 2021 •
edited
Loading

A(R73B CLH)`GWUWN 4UQ5
W%UI0D8(3T608IX XO)5SP7

@casbin-bot
Copy link
Contributor

@seriouszyx @tangyang9464 please review

@Steve0x2a
Copy link
Member

This pr looks good, but seems to contain code for #386

@jianmaikj
Copy link
Contributor Author

This pr looks good, but seems to contain code for #386

Indeed, I reverted that changes

Steve0x2a
Steve0x2a reviewed Dec 21, 2021
View reviewed changes
Copy link
Member

@Steve0x2a Steve0x2a left a comment

Choose a reason for hiding this comment

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

lgtm

@seriouszyx
Copy link
Contributor

Please fix.

image

@hsluoyz
Copy link
Member

hsluoyz commented Dec 21, 2021

@jianmaikj plz sign: https://cla-assistant.io/casdoor/casdoor

@CLAassistant
Copy link

CLAassistant commented Dec 21, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@jianmaikj jianmaikj changed the title Add loading and countdown status to the verification code sending button feat: Add loading and countdown status to the verification code sending button Dec 22, 2021
hsluoyz
hsluoyz requested changes Dec 22, 2021
View reviewed changes
web/src/component/CountDownInput.js Outdated Show resolved Hide resolved
web/src/component/CountDownInput.js Outdated Show resolved Hide resolved
@hsluoyz hsluoyz changed the title feat: Add loading and countdown status to the verification code sending button fix: Add loading and countdown status to the verification code sending button Dec 23, 2021
@hsluoyz
Copy link
Member

hsluoyz commented Dec 23, 2021

@jianmaikj plz fix:

image

@jianmaikj
fix: Add loading and countdown status to the verification code sendin…
23540e3 
…g button

Add loading and countdown status to the verification code sending button

Revert "Add bcrypt encrypted password type"

This reverts commit ae995b5.

fix:indentation
@hsluoyz hsluoyz merged commit fa45d30 into casdoor:master Dec 23, 2021
@casbin-bot
Copy link
Contributor

🎉 This PR is included in version 1.6.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Steve0x2a Steve0x2a Steve0x2a left review comments

@hsluoyz hsluoyz hsluoyz approved these changes

@seriouszyx seriouszyx Awaiting requested review from seriouszyx

@tangyang9464 tangyang9464 Awaiting requested review from tangyang9464

Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jianmaikj @casbin-bot @Steve0x2a @seriouszyx @hsluoyz @CLAassistant