Merge lp://staging/~dobey/ubuntuone-control-panel/update-4-2 into lp://staging/ubuntuone-control-panel/stable-4-2
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 375 |
| Proposed branch: | lp://staging/~dobey/ubuntuone-control-panel/update-4-2 |
| Merge into: | lp://staging/ubuntuone-control-panel/stable-4-2 |
| Diff against target: |
2467 lines (+1014/-333) 34 files modified
data/qt/images.qrc (+1/-0) data/qt/share_links.ui (+175/-20) data/qt/ubuntuone.qss (+1/-1) run-tests (+1/-1) setup.py (+5/-7) ubuntuone-control-panel-qt-gnome.desktop.in (+11/-0) ubuntuone-control-panel.in (+0/-1) ubuntuone-installer.desktop.in (+1/-0) ubuntuone/controlpanel/backend.py (+13/-4) ubuntuone/controlpanel/gui/__init__.py (+7/-1) ubuntuone/controlpanel/gui/qt/controlpanel.py (+10/-5) ubuntuone/controlpanel/gui/qt/folders.py (+4/-3) ubuntuone/controlpanel/gui/qt/gui.py (+16/-0) ubuntuone/controlpanel/gui/qt/main/__init__.py (+22/-6) ubuntuone/controlpanel/gui/qt/main/darwin.py (+52/-8) ubuntuone/controlpanel/gui/qt/main/tests/test_darwin.py (+104/-5) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+18/-8) ubuntuone/controlpanel/gui/qt/share_links.py (+86/-20) ubuntuone/controlpanel/gui/qt/share_links_search.py (+52/-32) ubuntuone/controlpanel/gui/qt/systray.py (+53/-68) ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+3/-4) ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+6/-5) ubuntuone/controlpanel/gui/qt/tests/test_share_links.py (+51/-9) ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py (+47/-41) ubuntuone/controlpanel/gui/qt/tests/test_start.py (+11/-0) ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+45/-57) ubuntuone/controlpanel/gui/qt/tests/test_wizard.py (+16/-5) ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py (+56/-0) ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_unique_app.py (+99/-4) ubuntuone/controlpanel/gui/qt/wizard.py (+7/-3) ubuntuone/controlpanel/gui/tests/__init__.py (+7/-7) ubuntuone/controlpanel/tests/test_backend.py (+30/-4) ubuntuone/controlpanel/utils/darwin.py (+2/-2) ubuntuone/controlpanel/web_client.py (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~dobey/ubuntuone-control-panel/update-4-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Diego Sarmentero (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[Mike McCracken]
- Trivial fix to make a test in test_folders actually run.
- Add support for menu in separate process on darwin. (LP: #1045939)
- Connect files service in wizard to enable display of remote folders. (LP: #978043)
[Rodney Dawes]
- Remove messaging menu integration file.
- Ignore some of the new pep8 warnings, and fix some others.
[Brian Curtin]
- Encode the volume path before checking whether or not it is a link.
[Barry Warsaw]
- Replace the third party simplejson module with the stdlib json module.
[Jeremy Bicha]
- Don't show Ubuntu One in System Settings when running GNOME.
[Diego Sarmentero]
- Adding IPC, so the new instances can send messages to the already running instance (LP: #1063927).
- Remove the text on x button pressed (LP: #1070917).
- Implementing new share tab design (LP: #1065194, #1056194).
- Accessing the Share tab from the systray menu and avoid refreshing the menu unnecesary (LP: #1072859 #1063781).
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
+1
"For a few to be immortal, many must die." [In Time]