Merge lp:~dobey/ubuntuone-control-panel/update-from-trunk into lp:ubuntuone-control-panel/stable-3-0
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 259 |
Merged at revision: | 259 |
Proposed branch: | lp:~dobey/ubuntuone-control-panel/update-from-trunk |
Merge into: | lp:ubuntuone-control-panel/stable-3-0 |
Diff against target: |
296 lines (+134/-8) 8 files modified
ubuntuone/controlpanel/gui/__init__.py (+4/-0) ubuntuone/controlpanel/gui/qt/controlpanel.py (+1/-0) ubuntuone/controlpanel/gui/qt/gui.py (+26/-2) ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+1/-1) ubuntuone/controlpanel/gui/qt/tests/__init__.py (+7/-0) ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+2/-0) ubuntuone/controlpanel/gui/qt/tests/test_gui.py (+76/-5) ubuntuone/controlpanel/gui/qt/tests/test_start.py (+17/-0) |
To merge this branch: | bzr merge lp:~dobey/ubuntuone-control-panel/update-from-trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Review via email: mp+101470@code.launchpad.net |
Commit message
[Diego Sarmentero]
- Restarting the wizard on current device removed.
[Natalia Bidart]
- Check for updates when the main window is shown. On linux, this is a no-op.
On windows, this will check for new versions of the software and will
prompt the user for confirmation to install updates.
- Make the LOADING_
To post a comment you must log in.