lp:~nataliabidart/ubuntuone-control-panel/fix-933576

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-control-panel at revision 274

Eric Casteleijn (community): Approve on 2012-03-02

Roberto Alsina (community): Approve on 2012-03-02

Diff: 1910 lines (+940/-456)

24 files modified

data/qt/controlpanel.ui (+4/-4)
data/qt/images.qrc (+7/-0)
data/qt/side_widget.ui (+214/-0)
data/qt/signin.ui (+115/-152)
data/qt/ubuntuone.qss (+15/-2)
ubuntuone/controlpanel/backend.py (+17/-4)
ubuntuone/controlpanel/gui/__init__.py (+5/-9)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+16/-5)
ubuntuone/controlpanel/gui/qt/gui.py (+1/-1)
ubuntuone/controlpanel/gui/qt/side_widget.py (+81/-0)
ubuntuone/controlpanel/gui/qt/signin.py (+7/-72)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+24/-4)
ubuntuone/controlpanel/gui/qt/tests/test_account.py (+0/-5)
ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+0/-2)
ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+19/-20)
ubuntuone/controlpanel/gui/qt/tests/test_devices.py (+0/-5)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+2/-1)
ubuntuone/controlpanel/gui/qt/tests/test_gui.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/test_preferences.py (+2/-16)
ubuntuone/controlpanel/gui/qt/tests/test_side_widget.py (+90/-0)
ubuntuone/controlpanel/gui/qt/tests/test_signin.py (+39/-147)
ubuntuone/controlpanel/gui/qt/tests/test_wizard.py (+158/-0)
ubuntuone/controlpanel/gui/qt/wizard.py (+110/-0)
ubuntuone/controlpanel/gui/tests/__init__.py (+13/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #933576: [FFE] Integrate the Qt SSO dialog for authentication	High	Fix Released
Bug #933577: Two default buttons in the remove device confirmation alert	Medium	Fix Released

Link a bug report

Related blueprints

284. By Natalia Bidart on 2012-03-02

Merged trunk in.

283. By Natalia Bidart on 2012-03-02

- No more 2 default buttons in the device remove confirmation dialog
  (LP: #933577).

282. By Natalia Bidart on 2012-03-02

Removed unnecessary styles.

281. By Natalia Bidart on 2012-03-02

Fixed lint issues.

280. By Natalia Bidart on 2012-03-02

Merged trunk in.

279. By Natalia Bidart on 2012-03-02

All tests green in qt/tests.

278. By Natalia Bidart on 2012-03-02

Merged dependency branch.

277. By Natalia Bidart on 2012-03-02

Less changes.

276. By Natalia Bidart on 2012-03-02

Merged trunk in.

275. By Natalia Bidart on 2012-03-01

Trying to make tests pass.