Merge lp:~diegosarmentero/ubuntu-sso-client/934502 into lp:ubuntu-sso-client

Proposed by Diego Sarmentero
Status: Merged
Approved by: Diego Sarmentero
Approved revision: 893
Merged at revision: 894
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/934502
Merge into: lp:ubuntu-sso-client
Prerequisite: lp:~diegosarmentero/ubuntu-sso-client/overlay-improves
Diff against target: 0 lines
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/934502
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Brian Curtin (community) Approve
Review via email: mp+94841@code.launchpad.net

Commit message

- Fixed: Qt UI: clicking on the "Set Up Account" button takes me instantly to the verification page, even if there are form errors (LP: #934502).

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) wrote :

+1

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

There seems to be a fresh conflict:

Text conflict in ubuntu_sso/qt/tests/test_setup_account.py
1 conflicts encountered.

review: Needs Fixing
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Attempt to merge into lp:ubuntu-sso-client failed due to conflicts:

text conflict in ubuntu_sso/qt/setup_account_page.py

893. By Diego Sarmentero

Conflict Resolved.

Preview Diff

Empty

Subscribers

People subscribed via source and target branches