Canonical SSO provider

Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_495006 into lp://staging/canonical-identity-provider/release

  1. bug_495006
  2. Merge into trunk
Proposed by David Owen
Status: Merged
Merged at revision: 48
Proposed branch: lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_495006
Merge into: lp://staging/canonical-identity-provider/release
Diff against target: 108 lines (+45/-8)
4 files modified
doctests/stories/sso-server/prefilled-email.txt (+29/-0)
identityprovider/templates/launchpad/registration/login.html (+2/-2)
identityprovider/templates/ubuntu/registration/login.html (+2/-2)
identityprovider/views/ui.py (+12/-4)
To merge this branch: bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_495006
Reviewer Review Type Date Requested Status
Danny Tamez (community) Approve
Review via email: mp+25804@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Danny Tamez (zematynnad) wrote :

Great job David

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.