lp:~ricardokirkner/canonical-identity-provider/yubikey_feature_flag
Created by
Ricardo Kirkner
and last modified
Only
Ricardo Kirkner
can upload to this branch. If you are
Ricardo Kirkner
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Merged
into
lp:~canonical-isd-hackers/canonical-identity-provider/add-yubikey-support
at
revision 168
- Michael Foord (community): Approve
-
Diff: 161 lines (+40/-8)6 files modifiedidentityprovider/templates/account/delete_key.html (+1/-0)
identityprovider/templates/account/keys.html (+1/-0)
identityprovider/templates/ubuntu/registration/two_step.html (+1/-0)
identityprovider/tests/test_views_ui.py (+29/-6)
identityprovider/views/account.py (+0/-1)
identityprovider/views/ui.py (+8/-1)
Superseded
for merging
into
lp:canonical-identity-provider/release
- Canonical ISD hackers: Pending requested
-
Diff: 2041 lines (+1134/-75)47 files modified.bzrignore (+1/-0)
identityprovider/admin.py (+9/-1)
identityprovider/fields.py (+2/-0)
identityprovider/forms.py (+51/-5)
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/decide.html (+1/-1)
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/select_language.html (+1/-1)
identityprovider/templates/ubuntu/registration/login.html (+24/-1)
identityprovider/templates/ubuntu/registration/two_step.html (+123/-0)
identityprovider/templates/widgets/launchpad/logout-button.html (+1/-0)
identityprovider/tests/test_forms.py (+93/-1)
identityprovider/tests/test_models_account.py (+4/-0)
identityprovider/tests/test_models_yubi.py (+156/-0)
identityprovider/tests/test_views_account.py (+15/-0)
identityprovider/tests/test_views_consumer.py (+43/-5)
identityprovider/tests/test_views_ui.py (+51/-4)
identityprovider/urls.py (+4/-0)
identityprovider/views/account.py (+77/-15)
identityprovider/views/consumer.py (+20/-3)
identityprovider/views/ui.py (+46/-5)
mockservice/yubiserver.py (+73/-0)
payload/__init__.py (+15/-3)
payload/virtualenv.py (+2/-3)
requirements.txt (+1/-0)
setup.py (+2/-2)
Branch information
Recent revisions
This branch has not been scanned yet.
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