Merge lp:~canonical-isd-hackers/canonical-identity-provider/yubikey-acct-requires-key into lp:~canonical-isd-hackers/canonical-identity-provider/add-yubikey-support
Proposed by
Danny Tamez
Status: | Merged |
---|---|
Approved by: | David Owen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 162 |
Proposed branch: | lp:~canonical-isd-hackers/canonical-identity-provider/yubikey-acct-requires-key |
Merge into: | lp:~canonical-isd-hackers/canonical-identity-provider/add-yubikey-support |
Diff against target: |
264 lines (+158/-12) 6 files modified
identityprovider/forms.py (+0/-8) identityprovider/templates/ubuntu/registration/two_step.html (+122/-0) identityprovider/tests/test_views_ui.py (+24/-0) identityprovider/urls.py (+1/-0) identityprovider/views/account.py (+2/-4) identityprovider/views/ui.py (+9/-0) |
To merge this branch: | bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/yubikey-acct-requires-key |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Owen (community) | Approve | ||
Review via email:
|
Commit message
Initial step for redirect to two form auth page when the account requires it.
Description of the change
This branch is the initial step towards two step authentication if the account requires it. If the acct requires it then after filling out email and password they will be redirected to a second page. This second page is only stubbed out right now. Newz2000 will finish that page.
To post a comment you must log in.