Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_507214_remove_email into lp://staging/canonical-identity-provider/release
Proposed by
David Owen
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 86 | ||||
| Proposed branch: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_507214_remove_email | ||||
| Merge into: | lp://staging/canonical-identity-provider/release | ||||
| Diff against target: |
442 lines (+221/-46) 15 files modified
doctests/stories/sso-server/standalone-login.txt (+1/-1) identityprovider/media/launchpad/styles.css (+12/-0) identityprovider/media/ubuntu/styles.css (+13/-0) identityprovider/models/account.py (+7/-0) identityprovider/models/emailaddress.py (+3/-0) identityprovider/templates/account/edit.html (+1/-18) identityprovider/templates/account/emails.html (+103/-0) identityprovider/templates/menu_item.html (+12/-0) identityprovider/templates/registration/email_sent.html (+5/-4) identityprovider/templates/widgets/ubuntu/logout-button.html (+16/-18) identityprovider/templatetags/menu_item.py (+14/-0) identityprovider/tests/test_models_account.py (+7/-0) identityprovider/tests/test_views_account.py (+1/-1) identityprovider/urls.py (+1/-0) identityprovider/views/account.py (+25/-4) |
||||
| To merge this branch: | bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_507214_remove_email | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Kirkner (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Add new page for managing e-mails. Selection of preferred remains on the main account page.
To post a comment you must log in.
Revision history for this message
| David Owen (dsowen) wrote | # |
Revision history for this message
| David Owen (dsowen) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hold off, I realized I need to add links for the Launchpad theme to work.