Merge lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.1 into lp://staging/ubuntuone-control-panel/stable-3-0
Proposed by
Natalia Bidart
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Natalia Bidart | ||||||||
| Approved revision: | 243 | ||||||||
| Merged at revision: | 243 | ||||||||
| Proposed branch: | lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.1 | ||||||||
| Merge into: | lp://staging/ubuntuone-control-panel/stable-3-0 | ||||||||
| Diff against target: |
300 lines (+143/-107) 4 files modified
ubuntuone/controlpanel/gui/qt/addfolder.py (+2/-1) ubuntuone/controlpanel/gui/qt/systray.py (+14/-3) ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+1/-0) ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+126/-103) |
||||||||
| To merge this branch: | bzr merge lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.1 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[ Diego Sarmentero <email address hidden> ]
- Fix dirty reactor.
[ Roberto Alsina <email address hidden> ]
- When selecting "Quit Ubuntu One" from the tray context menu,
shutdown syncdaemon (LP: #908888).
- Make addfolder open the file dialog in $HOME instead of in the
working directory (LP: #906541).
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Please fix the commit message to not say "ralsina" :)