Ubuntu One Control Panel

Merge lp://qastaging/~diegosarmentero/ubuntuone-control-panel/shares into lp://qastaging/ubuntuone-control-panel

  1. shares
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Roberto Alsina
Approved revision: 349
Merged at revision: 346
Proposed branch: lp://qastaging/~diegosarmentero/ubuntuone-control-panel/shares
Merge into: lp://qastaging/ubuntuone-control-panel
Prerequisite: lp://qastaging/~diegosarmentero/ubuntuone-control-panel/transfers
Diff against target: 317 lines (+175/-40)
5 files modified
ubuntuone/controlpanel/backend.py (+7/-0)
ubuntuone/controlpanel/gui/__init__.py (+2/-0)
ubuntuone/controlpanel/gui/qt/systray.py (+101/-39)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+4/-0)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+61/-1)
To merge this branch: bzr merge lp://qastaging/~diegosarmentero/ubuntuone-control-panel/shares
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Brian Curtin (community) Approve
Review via email: mp+120394@code.qastaging.launchpad.net

Commit message

- Show the not accepted shares (LP: #1034542).

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
lp://qastaging/~diegosarmentero/ubuntuone-control-panel/shares updated
349. By Diego Sarmentero

fixed lint issues

Revision history for this message
Roberto Alsina (ralsina) wrote :

Looks god to me, tests pass, did not do a strict code review though

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches