lp:~canonical-isd-hackers/canonical-identity-provider/yubikey-merged
Created by
Ricardo Kirkner
and last modified
- Get this branch:
- bzr branch lp:~canonical-isd-hackers/canonical-identity-provider/yubikey-merged
Members of
Canonical ISD hackers
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Rejected
for merging
into
lp:canonical-identity-provider/release
- Canonical ISD hackers: Pending requested
-
Diff: 2739 lines (+1762/-82)46 files modifiedfabtasks/__init__.py (+1/-1)
identityprovider/admin.py (+9/-1)
identityprovider/fields.py (+5/-0)
identityprovider/forms.py (+50/-3)
identityprovider/management/commands/populate.py (+3/-2)
identityprovider/models/__init__.py (+2/-0)
identityprovider/models/account.py (+4/-3)
identityprovider/models/yubi.py (+121/-0)
identityprovider/models/yubi_key.py (+19/-0)
identityprovider/templates/account/applications.html (+1/-1)
identityprovider/templates/account/confirm_new_email.html (+1/-1)
identityprovider/templates/account/delete_email.html (+1/-1)
identityprovider/templates/account/delete_key.html (+35/-0)
identityprovider/templates/account/edit.html (+11/-2)
identityprovider/templates/account/emails.html (+1/-1)
identityprovider/templates/account/keys.html (+83/-0)
identityprovider/templates/account/new_email.html (+1/-1)
identityprovider/templates/account/tokens.html (+1/-1)
identityprovider/templates/admin/readonly_confirm.html (+1/-1)
identityprovider/templates/consumer/index.html (+27/-4)
identityprovider/templates/invalid_identifier.html (+1/-1)
identityprovider/templates/launchpad/registration/login.html (+1/-1)
identityprovider/templates/registration/email_sent.html (+1/-1)
identityprovider/templates/registration/forgot_password.html (+1/-1)
identityprovider/templates/registration/new_account.html (+1/-1)
identityprovider/templates/registration/old_confirm_new_account.html (+1/-1)
identityprovider/templates/registration/reset_password.html (+1/-1)
identityprovider/templates/registration/token.html (+1/-0)
identityprovider/templates/select_language.html (+1/-1)
identityprovider/templates/ubuntu/registration/login.html (+24/-1)
identityprovider/templates/ubuntu/registration/two_step.html (+189/-0)
identityprovider/tests/test_models_yubi.py (+156/-0)
identityprovider/tests/unit/test_forms.py (+169/-0)
identityprovider/tests/unit/test_models_account.py (+4/-0)
identityprovider/tests/unit/test_views_account.py (+63/-2)
identityprovider/tests/unit/test_views_consumer.py (+42/-4)
identityprovider/tests/unit/test_views_server.py (+293/-1)
identityprovider/tests/unit/test_views_ui.py (+50/-4)
identityprovider/tests/utils.py (+51/-9)
identityprovider/urls.py (+4/-0)
identityprovider/views/account.py (+74/-11)
identityprovider/views/consumer.py (+20/-3)
identityprovider/views/server.py (+91/-10)
identityprovider/views/ui.py (+72/-6)
mockservice/yubiserver.py (+73/-0)
setup.py (+1/-0)
Branch information
Recent revisions
- 171. By Michael Hall
-
Store the PAPE authentication method used in the user's session and return it to the relaying party if it was requested.
- 170. By Matthew Nuzum
-
This includes the progress bar version of the 2nd factor authentication page. This is not 100% done, the progressive enhancement part needs further testing, however it is working and ready to be incorporated into other's code.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:canonical-identity-provider/release