Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.5 into lp://qastaging/ubuntuone-control-panel/stable-3-0
Proposed by
Natalia Bidart
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Natalia Bidart | ||||||||||||
| Approved revision: | 251 | ||||||||||||
| Merged at revision: | 250 | ||||||||||||
| Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.5 | ||||||||||||
| Merge into: | lp://qastaging/ubuntuone-control-panel/stable-3-0 | ||||||||||||
| Diff against target: |
508 lines (+248/-40) 11 files modified
data/qt/filesyncstatus.ui (+9/-2) data/qt/images.qrc (+1/-0) ubuntuone/controlpanel/gui/__init__.py (+17/-4) ubuntuone/controlpanel/gui/qt/controlpanel.py (+9/-20) ubuntuone/controlpanel/gui/qt/filesyncstatus.py (+12/-3) ubuntuone/controlpanel/gui/qt/gui.py (+7/-5) ubuntuone/controlpanel/gui/qt/tests/__init__.py (+67/-0) ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+2/-4) ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py (+29/-1) ubuntuone/controlpanel/gui/qt/tests/test_start.py (+20/-1) ubuntuone/controlpanel/gui/tests/test_show_quota_warning.py (+75/-0) |
||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.5 | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Updating from trunk up to revno 262:
[ Diego Sarmentero <email address hidden> ]
- Control Panel shows quota in red with more accuracy depending on the
free space (LP: #901314).
- The QT UI will make a button inactive while a (re-) connection is
in progress (LP: #878867).
[ Natalia B. Bidart <email address hidden> ]
- Center the main window when openning it (LP: #934173).
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