Merge lp:~ralsina/ubuntuone-windows-installer/back-is-wrong into lp:ubuntuone-windows-installer
Proposed by
Roberto Alsina
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||||||
Approved revision: | 74 | ||||||||
Merged at revision: | 57 | ||||||||
Proposed branch: | lp:~ralsina/ubuntuone-windows-installer/back-is-wrong | ||||||||
Merge into: | lp:ubuntuone-windows-installer | ||||||||
Diff against target: |
264 lines (+93/-23) 7 files modified
ubuntuone_installer/gui/qt/folders.py (+3/-2) ubuntuone_installer/gui/qt/local_folders.py (+14/-3) ubuntuone_installer/gui/qt/preferences.py (+1/-4) ubuntuone_installer/gui/qt/sync_now_or_later.py (+5/-0) ubuntuone_installer/gui/qt/tests/test_gui.py (+31/-4) ubuntuone_installer/gui/qt/tests/test_local_folders.py (+37/-10) ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py (+2/-0) |
||||||||
To merge this branch: | bzr merge lp:~ralsina/ubuntuone-windows-installer/back-is-wrong | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Diego Sarmentero (community) | Approve | ||
Review via email: mp+74818@code.launchpad.net |
Commit message
* Enable the back buttons in cloud-to-computer and computer-to-cloud in the right circumstances
* Set the correct title/subtitle for cloud-to-computer
* Fix the workflow for the "preferences" page
Description of the change
* Enable the back buttons in cloud-to-computer and computer-to-cloud in the right circumstances
* Set the correct title/subtitle for cloud-to-computer
To post a comment you must log in.
+1