Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/token_tweaks into lp://staging/canonical-identity-provider/release
Proposed by
David Owen
| Status: | Merged |
|---|---|
| Merged at revision: | 81 |
| Proposed branch: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/token_tweaks |
| Merge into: | lp://staging/canonical-identity-provider/release |
| Diff against target: |
308 lines (+52/-49) 15 files modified
identityprovider/forms.py (+1/-1) identityprovider/templates/enter_token.html (+4/-4) identityprovider/templates/launchpad/email/email-validation-token.txt (+1/-1) identityprovider/templates/launchpad/email/forgottenpassword.txt (+5/-5) identityprovider/templates/launchpad/email/newuser.txt (+5/-5) identityprovider/templates/launchpad/email/validate-email.txt (+5/-5) identityprovider/templates/registration/bad_token.html (+3/-3) identityprovider/templates/registration/email_sent.html (+3/-3) identityprovider/templates/registration/logout_to_confirm.html (+2/-2) identityprovider/templates/ubuntu/email/email-validation-token.txt (+1/-1) identityprovider/templates/ubuntu/email/forgottenpassword.txt (+5/-5) identityprovider/templates/ubuntu/email/newuser.txt (+5/-5) identityprovider/templates/ubuntu/email/validate-email.txt (+5/-5) identityprovider/tests/test_views_ui.py (+1/-1) identityprovider/views/ui.py (+6/-3) |
| To merge this branch: | bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/token_tweaks |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Anthony Lenton (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Text tweaks in the UI.
This will close the associated bug.
To post a comment you must log in.
Revision history for this message
| Anthony Lenton (elachuni) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
