Merge lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.92 into lp://staging/ubuntuone-control-panel/stable-3-0
| Status: | Merged | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Natalia Bidart | ||||||||||||||||||||||||||||
| Approved revision: | 258 | ||||||||||||||||||||||||||||
| Merged at revision: | 257 | ||||||||||||||||||||||||||||
| Proposed branch: | lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.92 | ||||||||||||||||||||||||||||
| Merge into: | lp://staging/ubuntuone-control-panel/stable-3-0 | ||||||||||||||||||||||||||||
| Diff against target: |
1335 lines (+334/-437) 19 files modified
ubuntuone/controlpanel/backend.py (+13/-31) ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py (+0/-94) ubuntuone/controlpanel/gui/__init__.py (+1/-1) ubuntuone/controlpanel/gui/qt/controlpanel.py (+3/-4) ubuntuone/controlpanel/gui/qt/folders.py (+3/-2) ubuntuone/controlpanel/gui/qt/gui.py (+1/-2) ubuntuone/controlpanel/gui/qt/main/__init__.py (+2/-1) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+10/-1) ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+13/-1) ubuntuone/controlpanel/gui/qt/tests/test_preferences.py (+15/-0) ubuntuone/controlpanel/gui/qt/tests/test_wizard.py (+12/-1) ubuntuone/controlpanel/gui/qt/wizard.py (+4/-8) ubuntuone/controlpanel/sd_client/__init__.py (+10/-13) ubuntuone/controlpanel/sd_client/linux.py (+0/-46) ubuntuone/controlpanel/tests/test_backend.py (+66/-105) ubuntuone/controlpanel/tests/test_sd_client.py (+23/-17) ubuntuone/controlpanel/utils/__init__.py (+8/-4) ubuntuone/controlpanel/utils/tests/test_windows.py (+106/-71) ubuntuone/controlpanel/utils/windows.py (+44/-35) |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.92 | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alejandro J. Cura (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Updating from trunk up to revno 308:
[ Brian Curtin <email address hidden> ]
- Match test behavior with updated functionality.
[ Diego Sarmentero <email address hidden> ]
- Removing encoding to return unicode (LP: #966513).
- Using limit_bandwidth attribute to properly process the info dict
for preferences (LP: #944256).
[ Natalia B. Bidart <email address hidden> ]
- When user rejects the License, also uninstall the application
when in Windows (LP: #968327).
- Remove custom path validation and use the one provided by syncdaemon
(LP: #824252).
- Make use of the new feature from syncdaemon where 'refresh_volumes'
returns a deferred that gets fired when the server info is ready
(LP: #851810).
- Ensured that Folders' tree view has proper texts in the columns to
have proper column widths (LP: #965175).
[ Roberto Alsina <email address hidden> ]
- Fixed the combination of --minimized --with-icon options
(LP: #968369).
Approving