Merge lp://qastaging/~diegosarmentero/ubuntuone-control-panel/tab-shares-functions into lp://qastaging/ubuntuone-control-panel
Proposed by
Diego Sarmentero
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Roberto Alsina | ||||
Approved revision: | 363 | ||||
Merged at revision: | 352 | ||||
Proposed branch: | lp://qastaging/~diegosarmentero/ubuntuone-control-panel/tab-shares-functions | ||||
Merge into: | lp://qastaging/ubuntuone-control-panel | ||||
Diff against target: |
2027 lines (+1644/-41) 17 files modified
data/qt/images.qrc (+1/-0) data/qt/share_file.ui (+94/-0) data/qt/share_links.ui (+196/-10) data/qt/ubuntuone.qss (+61/-0) ubuntuone/controlpanel/backend.py (+36/-1) ubuntuone/controlpanel/gui/__init__.py (+2/-0) ubuntuone/controlpanel/gui/qt/share_file.py (+63/-0) ubuntuone/controlpanel/gui/qt/share_links.py (+189/-1) ubuntuone/controlpanel/gui/qt/share_links_search.py (+318/-0) ubuntuone/controlpanel/gui/qt/tests/__init__.py (+18/-0) ubuntuone/controlpanel/gui/qt/tests/test_share_file.py (+76/-0) ubuntuone/controlpanel/gui/qt/tests/test_share_links.py (+161/-3) ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py (+302/-0) ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+15/-26) ubuntuone/controlpanel/sd_client/__init__.py (+20/-0) ubuntuone/controlpanel/tests/test_backend.py (+64/-0) ubuntuone/controlpanel/tests/test_sd_client.py (+28/-0) |
||||
To merge this branch: | bzr merge lp://qastaging/~diegosarmentero/ubuntuone-control-panel/tab-shares-functions | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Alejandro J. Cura (community) | Approve | ||
Review via email:
|
Commit message
- Adding functionality to the Share Links Tab (LP: #1039142).
To post a comment you must log in.
This is a huge branch, that could have been split in at least three branches. :-(
Please fix the commented lines in the last three testcases.
Does this need a freeze exception?