lp:~nataliabidart/ubuntu/oneiric/ubuntuone-control-panel/ubuntuone-control-panel-2.0.0
- Get this branch:
- bzr branch lp:~nataliabidart/ubuntu/oneiric/ubuntuone-control-panel/ubuntuone-control-panel-2.0.0
Branch merges
- Ubuntu Sponsors: Pending requested
-
Diff: 30030 lines (+2419/-25703)78 files modifiedMANIFEST (+0/-140)
PKG-INFO (+2/-21)
bin/ubuntuone-control-panel-qt (+10/-1)
data/gtk/overview.ui (+4/-29)
data/gtk/services.ui (+16/-86)
data/qt/account.ui (+23/-2)
data/qt/controlpanel.ui (+228/-191)
data/qt/images.qrc (+1/-0)
data/qt/preferences.ui (+3/-3)
data/qt/signin.ui (+203/-0)
data/qt/ubuntuone.qss (+27/-5)
debian/changelog (+29/-0)
debian/control (+7/-7)
debian/ubuntuone-control-panel-gtk.install (+0/-1)
docs/ubuntuone-control-panel-gtk.1 (+2/-2)
po/POTFILES.in (+0/-1)
po/ubuntuone-control-panel.pot (+0/-486)
setup.py (+2/-2)
ubuntuone-control-panel-gtk.desktop.in (+0/-11)
ubuntuone-control-panel.in (+1/-1)
ubuntuone/controlpanel/backend.py (+24/-20)
ubuntuone/controlpanel/cache.py (+50/-0)
ubuntuone/controlpanel/dbus_service.py (+0/-40)
ubuntuone/controlpanel/dbustests/test_dbus_service.py (+3/-34)
ubuntuone/controlpanel/gui/__init__.py (+5/-5)
ubuntuone/controlpanel/gui/gtk/gui.py (+9/-12)
ubuntuone/controlpanel/gui/gtk/tests/__init__.py (+3/-3)
ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py (+9/-1)
ubuntuone/controlpanel/gui/qt/__init__.py (+57/-2)
ubuntuone/controlpanel/gui/qt/account.py (+3/-0)
ubuntuone/controlpanel/gui/qt/addfolder.py (+11/-9)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+73/-30)
ubuntuone/controlpanel/gui/qt/device.py (+15/-6)
ubuntuone/controlpanel/gui/qt/devices.py (+12/-7)
ubuntuone/controlpanel/gui/qt/filesyncstatus.py (+7/-8)
ubuntuone/controlpanel/gui/qt/folders.py (+25/-11)
ubuntuone/controlpanel/gui/qt/gotoweb.py (+19/-5)
ubuntuone/controlpanel/gui/qt/gui.py (+28/-5)
ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+6/-4)
ubuntuone/controlpanel/gui/qt/main/linux.py (+4/-6)
ubuntuone/controlpanel/gui/qt/main/windows.py (+8/-11)
ubuntuone/controlpanel/gui/qt/preferences.py (+2/-0)
ubuntuone/controlpanel/gui/qt/signin.py (+89/-0)
ubuntuone/controlpanel/gui/qt/systray.py (+68/-0)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+93/-33)
ubuntuone/controlpanel/gui/qt/tests/test_account.py (+4/-9)
ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+24/-24)
ubuntuone/controlpanel/gui/qt/tests/test_common.py (+210/-0)
ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+129/-24)
ubuntuone/controlpanel/gui/qt/tests/test_device.py (+20/-18)
ubuntuone/controlpanel/gui/qt/tests/test_devices.py (+12/-7)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+27/-38)
ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py (+54/-2)
ubuntuone/controlpanel/gui/qt/tests/test_gui.py (+7/-0)
ubuntuone/controlpanel/gui/qt/tests/test_signin.py (+168/-0)
ubuntuone/controlpanel/gui/qt/tests/test_start.py (+91/-0)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+103/-0)
ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py (+20/-10)
ubuntuone/controlpanel/gui/qt/ubuntuonebin.py (+19/-10)
ubuntuone/controlpanel/gui/qt/ui/account_ui.py (+0/-84)
ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py (+0/-208)
ubuntuone/controlpanel/gui/qt/ui/device_ui.py (+0/-46)
ubuntuone/controlpanel/gui/qt/ui/devices_ui.py (+0/-71)
ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py (+0/-48)
ubuntuone/controlpanel/gui/qt/ui/folders_ui.py (+0/-90)
ubuntuone/controlpanel/gui/qt/ui/images_rc.py (+0/-23506)
ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py (+0/-59)
ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py (+0/-54)
ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py (+0/-115)
ubuntuone/controlpanel/gui/tests/__init__.py (+4/-2)
ubuntuone/controlpanel/gui/tests/test_url_sign.py (+2/-2)
ubuntuone/controlpanel/logger.py (+5/-1)
ubuntuone/controlpanel/replication_client.py (+1/-2)
ubuntuone/controlpanel/tests/test_backend.py (+88/-31)
ubuntuone/controlpanel/tests/test_cache.py (+58/-0)
ubuntuone/controlpanel/web_client/tests/__init__.py (+19/-0)
ubuntuone/controlpanel/web_client/tests/test_txwebclient.py (+155/-0)
ubuntuone/controlpanel/web_client/txwebclient.py (+18/-1)
Related source package recipes
Branch information
- Owner:
- Natalia Bidart
- Status:
- Merged
Recent revisions
- 33. By Natalia Bidart
-
* New upstream release:
[ Alejandro J. Cura <email address hidden>]
- Do not throw a webclient error when closing
(LP: #845105).
[ Natalia B. Bidart <email address hidden> ]
- Removed all code related to Bookmarks (LP: #850142).
- Replaces references to "Evolution" by "Thunderbird" (LP: #849494).
[ Rodney Dawes <email address hidden> ]
- Don't install a .desktop file for control panel
(part of LP: #838778).
- Point the indicator/Unity API at the installer .desktop file
(part of LP: #838778).
- Set the WMCLASS so Unity will fall back properly
(part of LP: #838778).
- Fix a few grammar mistakes (LP: #835093).
- Don't show the "Get NGB free!" label on "Join now" button at all
(LP: #819955).
* debian/control:
- ubuntuone-control- panel-gtk depends now on ubuntuone-installer >= 2.0.0.
- require ubuntuone-client >= 2.0.0.
- require ubuntu-sso-client >= 1.4.0.
- no longer install a .desktop file (will be installed by ubuntuone-installer) . - 31. By Colin Watson
-
merge lp:~paulbrianstewart/ubuntu/oneiric/ubuntuone-control-panel/835093-Spelling-Error-Fix
- 29. By Martin Pitt
-
* New upstream release.
- Work correctly with static and GI bindings of gobject (LP: #829186) - 24. By Daniel Holbach
-
debian/control: ubuntuone-
control- panel-gtk depends on python- aptdaemon- gtk
(LP: #762803).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/oneiric/ubuntuone-control-panel
