Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/ie_strict into lp://staging/canonical-identity-provider/release
Proposed by
David Owen
| Status: | Rejected | ||||
|---|---|---|---|---|---|
| Rejected by: | David Owen | ||||
| Proposed branch: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/ie_strict | ||||
| Merge into: | lp://staging/canonical-identity-provider/release | ||||
| Diff against target: |
975 lines (+304/-133) (has conflicts) 49 files modified
identityprovider/media/launchpad/styles.css (+8/-0) identityprovider/media/ubuntu/forms.css (+4/-0) identityprovider/media/ubuntu/styles.css (+2/-1) identityprovider/templates/403-csrf.html (+5/-3) identityprovider/templates/404.html (+5/-3) identityprovider/templates/500.html (+5/-3) identityprovider/templates/account/confirm_new_email.html (+5/-3) identityprovider/templates/account/deactivated.html (+5/-3) identityprovider/templates/account/delete_email.html (+5/-3) identityprovider/templates/account/edit.html (+5/-3) identityprovider/templates/account/new_email.html (+5/-3) identityprovider/templates/account/suspended.html (+5/-3) identityprovider/templates/account/tokens.html (+5/-3) identityprovider/templates/admin/readonly.html (+5/-3) identityprovider/templates/admin/readonly_confirm.html (+5/-3) identityprovider/templates/consumer/index.html (+12/-5) identityprovider/templates/consumer/request_form.html (+7/-2) identityprovider/templates/cookies.html (+5/-3) identityprovider/templates/decide.html (+5/-3) identityprovider/templates/enter_token.html.OTHER (+45/-0) identityprovider/templates/invalid_identifier.html (+5/-3) identityprovider/templates/launchpad/base.html (+7/-4) identityprovider/templates/launchpad/registration/login.html (+5/-3) identityprovider/templates/limitexceeded.html (+5/-3) identityprovider/templates/person.html (+6/-1) identityprovider/templates/post-assertion.html (+5/-3) identityprovider/templates/preauth_fail.html (+5/-3) identityprovider/templates/readonly.html (+5/-3) identityprovider/templates/registration/bad_token.html (+5/-3) identityprovider/templates/registration/confirm_new_account.html (+5/-3) identityprovider/templates/registration/email_sent.html (+5/-2) identityprovider/templates/registration/forgot_password.html (+5/-3) identityprovider/templates/registration/logout_to_confirm.html (+5/-3) identityprovider/templates/registration/new_account.html (+5/-3) identityprovider/templates/registration/reset_password.html (+5/-3) identityprovider/templates/registration/token.html (+7/-2) identityprovider/templates/select_language.html (+8/-6) identityprovider/templates/server_info.html (+5/-3) identityprovider/templates/static/description.html (+5/-3) identityprovider/templates/static/faq.html (+5/-3) identityprovider/templates/twocols.html (+5/-3) identityprovider/templates/ubuntu/base.html (+6/-3) identityprovider/templates/ubuntu/registration/login.html (+8/-6) identityprovider/templates/untrusted.html (+5/-3) identityprovider/templates/widgets/last_auth_sites.html (+4/-2) identityprovider/templates/widgets/launchpad/logout-button.html (+4/-2) identityprovider/templates/widgets/trusted_rp.html (+4/-2) identityprovider/templates/widgets/ubuntu/logout-button.html (+8/-0) identityprovider/templates/widgets/unknown_rp.html (+4/-2) Contents conflict in identityprovider/templates/enter_token.html Text conflict in identityprovider/templates/widgets/ubuntu/logout-button.html |
||||
| To merge this branch: | bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/ie_strict | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical ISD hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixes HTML output to enable strict mode in IE, resolving some severe rendering issues there.
To post a comment you must log in.
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
Bad merge, canceling.