Merge lp://qastaging/~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.8.5 into lp://qastaging/ubuntu/natty/ubuntuone-control-panel
| Status: | Merged |
|---|---|
| Merged at revision: | 13 |
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.8.5 |
| Merge into: | lp://qastaging/ubuntu/natty/ubuntuone-control-panel |
| Diff against target: |
1118 lines (+389/-76) 20 files modified
PKG-INFO (+2/-24) data/dashboard.ui (+1/-1) data/device.ui (+60/-15) data/management.ui (+20/-0) debian/changelog (+31/-0) debian/control (+7/-4) setup.py (+2/-2) ubuntuone-control-panel-gtk.desktop.in (+2/-1) ubuntuone/controlpanel/backend.py (+9/-0) ubuntuone/controlpanel/dbus_client.py (+28/-0) ubuntuone/controlpanel/gtk/gui.py (+42/-14) ubuntuone/controlpanel/gtk/package_manager.py (+1/-0) ubuntuone/controlpanel/gtk/tests/__init__.py (+5/-2) ubuntuone/controlpanel/gtk/tests/test_gui.py (+43/-2) ubuntuone/controlpanel/gtk/tests/test_widgets.py (+8/-0) ubuntuone/controlpanel/gtk/widgets.py (+4/-5) ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py (+97/-6) ubuntuone/controlpanel/integrationtests/test_dbus_service.py (+2/-0) ubuntuone/controlpanel/tests/__init__.py (+1/-0) ubuntuone/controlpanel/tests/test_backend.py (+24/-0) |
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.8.5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Sponsors | Pending | ||
|
Review via email:
|
|||
Description of the change
* New upstream release:
[ Natalia B. Bidart <email address hidden> ]
- Restored 'Services' tab. Fixed desktopcouch dependencies management.
- Improve .desktop file to avoid duplication on messaging menu
(LP: #721525).
- Fixing tests according to latest changes to syncdaemon.
- 'Limit bandwidth' layout was improved (LP: #715812).
- Commenting styling code out to allow UX people to create a proper .rc
file (LP: #715717).
- Added 'ubuntuone' to the list of installable modules.
[ Bilal Akhtar <email address hidden> ]
- AskUbuntu.com link button has now tooltip (LP: #715879).
[ Alejandro J. Cura <email address hidden> ]
- Checkbox in devices tab to toggle notifications (LP: #717172).
[ Robert Roth <email address hidden> ]
- Fixed usage string to be more readable (LP: #715710).
* debian/control:
- bumped depends ubuntuone-client (>= 1.5.4),
- bumped depends ubuntu-sso-client (>= 1.1.11),
- ubuntuone-
python-defer
