Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.3 into lp://qastaging/ubuntuone-control-panel/stable-3-0
Proposed by
Natalia Bidart
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Natalia Bidart | ||||||||||||||||
| Approved revision: | 247 | ||||||||||||||||
| Merged at revision: | 246 | ||||||||||||||||
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.3 | ||||||||||||||||
| Merge into: | lp://qastaging/ubuntuone-control-panel/stable-3-0 | ||||||||||||||||
| Diff against target: |
518 lines (+131/-77) 17 files modified
run-tests.bat (+40/-35) setup.py (+2/-1) ubuntuone/controlpanel/backend.py (+16/-6) ubuntuone/controlpanel/dbus_service.py (+5/-10) ubuntuone/controlpanel/gui/gtk/gui.py (+2/-0) ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py (+4/-0) ubuntuone/controlpanel/gui/gtk/widgets.py (+3/-0) ubuntuone/controlpanel/gui/qt/addfolder.py (+3/-5) ubuntuone/controlpanel/gui/qt/main/__init__.py (+4/-0) ubuntuone/controlpanel/gui/qt/main/linux.py (+0/-5) ubuntuone/controlpanel/gui/qt/main/windows.py (+1/-7) ubuntuone/controlpanel/gui/qt/tests/__init__.py (+4/-0) ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+2/-1) ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py (+2/-2) ubuntuone/controlpanel/sd_client/__init__.py (+4/-0) ubuntuone/controlpanel/tests/test_backend.py (+28/-2) ubuntuone/controlpanel/tests/test_sd_client.py (+11/-3) |
||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.3 | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[ Roberto Alsina <email address hidden>
- Use uncompressed resources and the same qss loading code in both platforms
to avoid future inconsistencies (LP: #917322).
[ Diego Sarmentero <email address hidden> ]
- Folder list no longer shows garbage for user homes non-ascii
(LP: #851356).
[ Natalia B. Bidart <email address hidden> ]
- Fix lint issues (LP: #920640).
[ Manuel de la Pena <email address hidden> ]
- Adds the possibility to skip the lint checks on windows when passing the
/skip-lint parameter to run-tests.bat (LP: #918248).
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
Looks good!