Merge lp://qastaging/~ralsina/ubuntuone-control-panel/installer-option into lp://qastaging/ubuntuone-control-panel
Proposed by
Roberto Alsina
Status: | Merged |
---|---|
Approved by: | Roberto Alsina |
Approved revision: | 308 |
Merged at revision: | 295 |
Proposed branch: | lp://qastaging/~ralsina/ubuntuone-control-panel/installer-option |
Merge into: | lp://qastaging/ubuntuone-control-panel |
Prerequisite: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/license-page |
Diff against target: |
335 lines (+62/-45) 8 files modified
ubuntuone/controlpanel/gui/qt/controlpanel.py (+8/-0) ubuntuone/controlpanel/gui/qt/gui.py (+8/-4) ubuntuone/controlpanel/gui/qt/main/__init__.py (+6/-1) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+9/-3) ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+10/-0) ubuntuone/controlpanel/gui/qt/tests/test_start.py (+1/-1) ubuntuone/controlpanel/gui/qt/tests/test_wizard.py (+11/-23) ubuntuone/controlpanel/gui/qt/wizard.py (+9/-13) |
To merge this branch: | bzr merge lp://qastaging/~ralsina/ubuntuone-control-panel/installer-option |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Diego Sarmentero (community) | Approve | ||
Review via email:
|
Commit message
- Made the license page from the wizard be shown (only when called with --installer) (LP: #933697).
Description of the change
- Added the license page to the wizard (only when called with --installer) (LP: #933697).
To test IRL:
* remove credentials
* If you start u1cp, you will get the "sign in/sign up" page
* Start u1cp again with the --installer option, and you should get a license page, for which the "next" page is "signin / signup"
To post a comment you must log in.
+1