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

Branch merges

Propose for merging

No branches dependent on this one.

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

Shane Fagan (community): Approve on 2011-04-13

Roberto Alsina (community): Approve on 2011-04-13

Diff: 337 lines (+54/-34)

11 files modified

bin/windows-ubuntu-sso-login (+3/-0)
setup.py (+6/-4)
ubuntu_sso/main/__init__.py (+6/-4)
ubuntu_sso/main/linux.py (+8/-6)
ubuntu_sso/main/tests/test_common.py (+3/-4)
ubuntu_sso/main/tests/test_linux.py (+3/-1)
ubuntu_sso/main/tests/test_windows.py (+12/-6)
ubuntu_sso/main/windows.py (+4/-2)
ubuntu_sso/qt/controllers.py (+6/-4)
ubuntu_sso/qt/gui.py (+2/-2)
ubuntu_sso/qt/tests/show_gui.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #732203: There is no ui module that can be used on Windows

Medium

Fix Released

Link a bug report

Related blueprints

768. By Manuel de la Peña on 2011-04-13

Fixed small typo.

767. By Manuel de la Peña on 2011-04-13

Fix conflicts with the merges.

Merged branch lp:~ralsina/ubuntu-sso-client/fix_manuel_conflicts

766. By Manuel de la Peña on 2011-04-12

Fixed conflicts with parent branch.

765. By Manuel de la Peña on 2011-04-07

Merged with add_widows_ui_root.

764. By Manuel de la Peña on 2011-03-31

Merged with add_windows_ui_root.

763. By Manuel de la Peña on 2011-04-05

Merged with add_windows_ui_root

762. By Manuel de la Peña on 2011-03-31

Fixed the following:
* Updated the Linux test to assert that the ui module is passed as a kwarg.
* Fixed some smelling mistakes.
* Fixed lint and pep8 issues.

761. By Manuel de la Peña on 2011-03-31

Moved the logic from the pages controllers to the wizard controller and connected the actions through Qt signals.

760. By Manuel de la Peña on 2011-03-31

Added the console script for py2exe and fixed signals definition.

759. By Manuel de la Peña on 2011-03-31

Added a some time to sleep so that the tests can pass in a vm.