lp:~mandel/ubuntu-sso-client/windows_ui_1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-sso-client at revision 692

Natalia Bidart (community): Approve on 2011-03-30

Shane Fagan (community): Approve on 2011-03-25

Diff: 1666 lines (+1463/-65)

11 files modified

.bzrignore (+6/-0)
data/qt/choose_sign_in.ui (+121/-0)
data/qt/current_user_sign_in.ui (+201/-0)
data/qt/email_verification.ui (+130/-0)
data/qt/setup_account.ui (+508/-0)
data/qt/terms_and_conditions.ui (+158/-0)
setup.py (+252/-26)
ubuntu_sso/gtk/gui.py (+2/-39)
ubuntu_sso/qt/__init__.py (+1/-0)
ubuntu_sso/qt/gui.py (+21/-0)
ubuntu_sso/utils/ui.py (+63/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

733. By Manuel de la Peña on 2011-03-30

Fix typo.

732. By Manuel de la Peña on 2011-03-30

Merged with trunk.

731. By Manuel de la Peña on 2011-03-30

Fixed criss-cross issue with the branch.

730. By Manuel de la Peña on 2011-03-18

Fixed merge issue in setup.py

729. By Manuel de la Peña on 2011-03-25

Fixed typos.

728. By Manuel de la Peña on 2011-03-25

Merged with branch that fixed lint issues.

727. By Manuel de la Peña on 2011-03-25

Added missing author.

726. By Manuel de la Peña on 2011-03-18

Merged with fix_732112 and resolved conflicts.

725. By Manuel de la Peña on 2011-03-16

Merged with the main_4 branch.

724. By Manuel de la Peña on 2011-03-16

Updated the setup.py to add missing packages.