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

Branch merges

Propose for merging

No branches dependent on this one.

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

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

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

Diff: 1319 lines (+848/-56)

16 files modified

data/qt/controlpanel.ui (+7/-2)
data/qt/local_folders.ui (+179/-0)
ubuntuone/controlpanel/gui/__init__.py (+10/-0)
ubuntuone/controlpanel/gui/qt/addfolder.py (+9/-5)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+4/-2)
ubuntuone/controlpanel/gui/qt/folders.py (+298/-1)
ubuntuone/controlpanel/gui/qt/gotoweb.py (+17/-1)
ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+16/-7)
ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+1/-1)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+206/-0)
ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py (+24/-5)
ubuntuone/controlpanel/gui/qt/tests/test_wizard.py (+33/-15)
ubuntuone/controlpanel/gui/qt/wizard.py (+33/-7)
ubuntuone/controlpanel/tests/__init__.py (+9/-0)
ubuntuone/controlpanel/tests/test_login_client.py (+1/-5)
ubuntuone/controlpanel/tests/test_sd_client.py (+1/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #888521: The folder sync sentence reads a bit wrong	High	Fix Released
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

Merged trunk in.

295. By Natalia Bidart on 2012-03-19

Fixed lint issues.

294. By Natalia Bidart on 2012-03-19

- Adding tests for CalculateSize and FolderItem.

293. By Natalia Bidart on 2012-03-19

All green for addfolder.

292. By Natalia Bidart on 2012-03-19

All green for wizard.

291. By Natalia Bidart on 2012-03-19

Fixing tests.

290. By Natalia Bidart on 2012-03-19

- Added 'Computer to cloud' page to the wizard (part of LP: #933697).
- Tweaked the title of the aforementioned page (LP: #888521).

289. By Natalia Bidart on 2012-03-19

Merging dependency branch in.

288. By Roberto Alsina on 2012-03-16

- Enable platform-specific styling (LP: #953318).

287. By Natalia Bidart on 2012-03-16

- Implemented a method to list the user's default folders in every platform (part of LP: #933697).