Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/fix-933576 into lp://qastaging/ubuntuone-control-panel
Proposed by
Natalia Bidart
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Natalia Bidart | ||||||||
| Approved revision: | 284 | ||||||||
| Merged at revision: | 274 | ||||||||
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/fix-933576 | ||||||||
| Merge into: | lp://qastaging/ubuntuone-control-panel | ||||||||
| Diff against target: |
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) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/fix-933576 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Eric Casteleijn (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Changed the initial signin page so both login and register options are shown,
and when clicked, the user is presented with either the Qt login dialog,
or the Qt registration dialog (LP: #933576).
Description of the change
To test IRL, please have all our U1 nightlies installed and updated.
Inside this branch, run:
./setup.py clean build; U1_DEBUG=True PYTHONPATH=. bin/ubuntuone-
Remove your current device and you should be taken to the 'choose sign in' page where you can either register or login.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1