Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_589335_auth_tokens into lp://staging/canonical-identity-provider/release
Proposed by
Łukasz Czyżykowski
| Status: | Merged |
|---|---|
| Merged at revision: | 73 |
| Proposed branch: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_589335_auth_tokens |
| Merge into: | lp://staging/canonical-identity-provider/release |
| Diff against target: |
1395 lines (+506/-196) 22 files modified
doctests/stories/openid/per-version/sso-workflow-complete.txt (+2/-2) doctests/stories/openid/per-version/sso-workflow-register.txt (+1/-1) doctests/stories/openid/per-version/sso-workflow-reset-password.txt (+1/-1) doctests/stories/sso-server/standalone-login.txt (+172/-46) identityprovider/forms.py (+20/-1) identityprovider/models/authtoken.py (+40/-4) identityprovider/templates/enter_token.html (+37/-0) identityprovider/templates/launchpad/email/forgottenpassword.txt (+4/-0) identityprovider/templates/launchpad/email/newuser.txt (+4/-0) identityprovider/templates/launchpad/email/validate-email.txt (+4/-0) identityprovider/templates/registration/confirm_new_account.html (+1/-1) identityprovider/templates/registration/email_sent.html (+16/-6) identityprovider/templates/registration/reset_password.html (+1/-1) identityprovider/templates/ubuntu/email/forgottenpassword.txt (+4/-0) identityprovider/templates/ubuntu/email/newuser.txt (+4/-0) identityprovider/templates/ubuntu/email/validate-email.txt (+4/-0) identityprovider/tests/test_views_ui.py (+79/-93) identityprovider/tests/utils.py (+2/-0) identityprovider/urls.py (+9/-4) identityprovider/views/account.py (+11/-5) identityprovider/views/ui.py (+79/-31) identityprovider/views/utils.py (+11/-0) |
| To merge this branch: | bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_589335_auth_tokens |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical ISD hackers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
