Merge lp://staging/~stuartmetcalfe/canonical-identity-provider/more-2f-fixes into lp://staging/canonical-identity-provider/release
Proposed by
Stuart Metcalfe
| Status: | Merged | ||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Simon Davy | ||||||||||||||||||||||||
| Approved revision: | no longer in the source branch. | ||||||||||||||||||||||||
| Merged at revision: | 367 | ||||||||||||||||||||||||
| Proposed branch: | lp://staging/~stuartmetcalfe/canonical-identity-provider/more-2f-fixes | ||||||||||||||||||||||||
| Merge into: | lp://staging/canonical-identity-provider/release | ||||||||||||||||||||||||
| Diff against target: |
349 lines (+104/-31) 14 files modified
identityprovider/media/ubuntu/forms.css (+1/-1) identityprovider/media/ubuntu/styles.css (+27/-1) identityprovider/templates/account/applications.html (+3/-3) identityprovider/templates/account/delete_email.html (+4/-4) identityprovider/templates/account/emails.html (+3/-3) identityprovider/templates/device/list.html (+5/-5) identityprovider/templates/launchpad/registration/twofactor.html (+2/-2) identityprovider/templates/ubuntu/registration/twofactor.html (+2/-2) identityprovider/templates/widgets/ubuntu/logout-button.html (+10/-2) identityprovider/tests/acceptance/applications/delete_app.py (+2/-2) identityprovider/tests/acceptance/logout/logout_deep_pages.py (+36/-0) identityprovider/tests/acceptance/shared/helpers.py (+2/-2) identityprovider/views/account.py (+1/-1) identityprovider/views/ui.py (+6/-3) |
||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~stuartmetcalfe/canonical-identity-provider/more-2f-fixes | ||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Simon Davy (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Various minor fixes for pre-release bugs. Specifically bug #948434, bug #948995, bug #948440, bug #948408, bug #854854 and bug #937063
Description of the change
Various minor fixes for pre-release bugs. Specifically bug #948434, bug #948995, bug #948440, bug #948408, bug #854854 and bug #937063
To post a comment you must log in.
Revision history for this message
| Simon Davy (bloodearnest) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
