Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/share-subs into lp://qastaging/ubuntuone-control-panel
Proposed by
Natalia Bidart
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||
Approved revision: | 63 | ||||
Merged at revision: | 62 | ||||
Proposed branch: | lp://qastaging/~nataliabidart/ubuntuone-control-panel/share-subs | ||||
Merge into: | lp://qastaging/ubuntuone-control-panel | ||||
Diff against target: |
799 lines (+459/-44) 7 files modified
ubuntuone/controlpanel/backend.py (+48/-8) ubuntuone/controlpanel/dbus_client.py (+27/-2) ubuntuone/controlpanel/gtk/gui.py (+8/-7) ubuntuone/controlpanel/gtk/tests/test_gui.py (+17/-3) ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py (+156/-4) ubuntuone/controlpanel/tests/__init__.py (+76/-2) ubuntuone/controlpanel/tests/test_backend.py (+127/-18) |
||||
To merge this branch: | bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/share-subs | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | fieldtest natty | Approve | |
Martin Albisetti (community) | Approve | ||
Eric Casteleijn (community) | Abstain | ||
Review via email:
|
Commit message
- Shares info is now displayed in 'Folders' tab and is modifiable (LP: #714583).
Description of the change
(NOTE: you need to run syncdaemon nightlies or syncdaemon from trunk)
To test, open 2 terminals pointing to this branch and run:
terminal 1: killall ubuntuone-
terminal 2: DEBUG=True PYTHONPATH=. ./bin/ubuntuone
and play with the Folders tab, subscribing and/or unsubcribing from shares. Be careful this will modify your real setting, so use dummy shares.
To post a comment you must log in.
I cannot test this, as it seems my ubuntuone-client is not up to date.