lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/fix-823648

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/oneiric/ubuntuone-control-panel at revision 28

Ken VanDine: Approve on 2011-08-12

Ubuntu branches: Pending requested 2011-08-12

Diff: 4336 lines (+1992/-1277)

33 files modified

MANIFEST (+140/-0)
PKG-INFO (+20/-1)
data/qt/account.ui (+104/-110)
data/qt/controlpanel.ui (+261/-342)
data/qt/device.ui (+3/-3)
data/qt/devices.ui (+66/-76)
data/qt/filesyncstatus.ui (+20/-30)
data/qt/folders.ui (+112/-36)
data/qt/loadingoverlay.ui (+103/-118)
data/qt/preferences.ui (+24/-21)
data/qt/ubuntuone.qss (+84/-33)
debian/changelog (+7/-0)
debian/control (+4/-4)
po/ubuntuone-control-panel.pot (+486/-0)
setup.py (+1/-1)
ubuntuone/controlpanel/backend.py (+3/-1)
ubuntuone/controlpanel/gui/__init__.py (+4/-3)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+1/-1)
ubuntuone/controlpanel/gui/qt/folders.py (+12/-11)
ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+2/-1)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+11/-30)
ubuntuone/controlpanel/gui/qt/ui/account_ui.py (+42/-35)
ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py (+72/-94)
ubuntuone/controlpanel/gui/qt/ui/device_ui.py (+3/-3)
ubuntuone/controlpanel/gui/qt/ui/devices_ui.py (+28/-31)
ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py (+5/-9)
ubuntuone/controlpanel/gui/qt/ui/folders_ui.py (+48/-19)
ubuntuone/controlpanel/gui/qt/ui/images_rc.py (+281/-223)
ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py (+2/-7)
ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py (+1/-1)
ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py (+30/-29)
ubuntuone/controlpanel/gui/tests/test_url_sign.py (+8/-2)
ubuntuone/controlpanel/logger.py (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

28. By dobey on 2011-08-12

* New upstream release.
  - ImportError: cannot import name LOGFOLDER (LP: #823648)

27. By Daniel Holbach on 2011-07-27

Add pyqt4-dev-tools and python-qt4 to Build-Depends to fix FTBFS

26. By Sebastien Bacher on 2011-07-25

releasing version 1.1.1-0ubuntu1

25. By Sebastien Bacher on 2011-07-20

releasing version 1.0.0-0ubuntu3

24. By Daniel Holbach on 2011-05-17

debian/control: ubuntuone-control-panel-gtk depends on python-aptdaemon-gtk
(LP: #762803).

23. By Sebastien Bacher on 2011-04-20

releasing version 1.0.0-0ubuntu1

22. By Sebastien Bacher on 2011-04-20

* New upstream release:
[ Natalia B. Bidart <email address hidden> ]
    - Hide and show replications boxes when replication list is ready and the
    user clicked on Services tab (hack to solve LP: #750309).
* New upstream release.
  - ubuntuone-syncdaemon running without account (LP: #744731)

21. By Sebastien Bacher on 2011-04-13

releasing version 0.9.6-0ubuntu1

20. By Sebastien Bacher on 2011-04-08

releasing version 0.9.5-0ubuntu1

19. By Ken VanDine on 2011-03-23

releasing version 0.9.4-0ubuntu1