lp:~nataliabidart/ubuntuone-control-panel/cloud-to-computer-page

Branch merges

Propose for merging

No branches dependent on this one.

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

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

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

Diff: 1455 lines (+810/-180)

9 files modified

data/qt/are_you_sure.ui (+153/-0)
data/qt/folders.ui (+10/-3)
ubuntuone/controlpanel/gui/__init__.py (+15/-0)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+3/-1)
ubuntuone/controlpanel/gui/qt/folders.py (+46/-19)
ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+5/-0)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+164/-91)
ubuntuone/controlpanel/gui/qt/tests/test_wizard.py (+240/-49)
ubuntuone/controlpanel/gui/qt/wizard.py (+174/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #933697: [FFE] Integrate missing pages to Qt Control Panel

High

Fix Released

Link a bug report

Related blueprints

296. By Natalia Bidart on 2012-03-19

- Remote folders now list all the folder but no explore button is offered.

295. By Natalia Bidart on 2012-03-19

Merged trunk in.

294. By Natalia Bidart on 2012-03-16

Pep8 fixes.

293. By Natalia Bidart on 2012-03-16

Fixed lint, added test in wizard for confirm_dialog.

292. By Natalia Bidart on 2012-03-16

All test green, added tests for closing/canceling the wizard.

291. By Natalia Bidart on 2012-03-16

Merged trunk in.

290. By Natalia Bidart on 2012-03-16

Twekaing tests so they pass.

289. By Natalia Bidart on 2012-03-16

Changes from dependency branch.

288. By Natalia Bidart on 2012-03-16

- Added 'Cloud to computer' page to the initial wizard.

287. By Natalia Bidart on 2012-03-16

Dependency branch.