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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~mandel/ubuntu-sso-client/choose_correct_ui_module at revision 767

Manuel de la Peña: Pending requested 2011-04-13

Diff: 173 lines (+22/-21)

6 files modified

data/qt/setup_account.ui (+1/-1)
setup.py (+4/-4)
ubuntu_sso/qt/controllers.py (+8/-7)
ubuntu_sso/qt/gui.py (+6/-6)
ubuntu_sso/qt/tests/test_windows.py (+1/-1)
ubuntu_sso/utils/ui.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

702. By Roberto Alsina on 2011-04-13

Fix conflicts

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

Partial fix for lp:732203

This branch provides the root gui object that allows to launch the qt gui in a windows environment. The root object creates the QWizard, adds the different pages and whose the UI.

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

Partial fix for lp:732203

Add a number of tests that ensure that the .ui generated files are correctly used by the ubuntu_sso.qt.gui.py module. It the .ui files rename a widget in a way that is not understood by the gui module the fails will fail allowing to ensure the correct behavior of the UI.

699. By Alejandro J. Cura on 2011-04-12

A new value was added the Secret DBus struct, let's handle it (LP: #734671).

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

Partial fix for lp:732203

Add SSO functionality to the Qt UI allowing to register and sign in users using the Ubuntu SSO client backend.

697. By Natalia Bidart on 2011-04-05

Moving style check down so exit code does not get hidden by &&.

696. By Natalia Bidart on 2011-04-05

Added "set -e" to the test runner script.

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

Provides the UI with the required controllers that will ensure that the navigation in the Wizard is the correct one. This branch does not yet provide the sso functionality.

694. By Manuel de la Peña on 2011-04-01

Fixes lp:746096 the bug by ensuring that we do not try to load a json object from None.

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

Fixes lp: 746183

Fix the issue by updating the location to which setup.py copies the glade data files.