Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/token-ui-fix into lp://staging/canonical-identity-provider/release
Proposed by
Łukasz Czyżykowski
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 74 | ||||
| Proposed branch: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/token-ui-fix | ||||
| Merge into: | lp://staging/canonical-identity-provider/release | ||||
| Diff against target: |
202 lines (+38/-27) 7 files modified
identityprovider/media/ubuntu/styles.css (+4/-0) identityprovider/templates/account/applications.html (+9/-10) identityprovider/templates/account/edit.html (+0/-2) identityprovider/templates/widgets/ubuntu/logout-button.html (+10/-0) identityprovider/tests/test_views_account.py (+11/-11) identityprovider/urls.py (+1/-1) identityprovider/views/account.py (+3/-3) |
||||
| To merge this branch: | bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/token-ui-fix | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Anthony Lenton (community) | Approve | ||
|
Review via email:
|
|||
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
