lp://qastaging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntuone-control-panel/stable-3-0 at revision 243

dobey (community): Approve on 2012-01-03

Diff: 300 lines (+143/-107)

4 files modified

ubuntuone/controlpanel/gui/qt/addfolder.py (+2/-1)
ubuntuone/controlpanel/gui/qt/systray.py (+14/-3)
ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+1/-0)
ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+126/-103)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #906541: UDF creation should start in home directory	Undecided	Fix Released
Bug #908888: Windows: "Quit Ubuntu One" on the tray icon doesn't close syncdaemon	Medium	Fix Released

Link a bug report

Related blueprints

243. By Natalia Bidart on 2012-01-03

Updating from trunk using revisions 247, 248 and 249.

242. By Natalia Bidart on 2011-12-20

[ Natalia B. Bidart <email address hidden> ]
  - Install all QT packages (LP: #905354).
  - List as python package 'utils' (LP: #898810).
  - Fixed typo on login screen (LP: #890410).

[ Diego Sarmentero <email address hidden> ]
  - Fixed: On the devices tab in u1cp, the icons are misaligned (LP: #856362).
  - Fixed QT UI folder view explore button (LP: #822698).

[ Manuel de la Pena <email address hidden> ]
  - Moved auto-update code from the u1-windows-installer to the control panel.
  - Changed the import from ubuntuone-dev-tools so that we do not use the
    deprecated API.

241. By dobey on 2011-12-01

Set the version to 2.99

240. By Natalia Bidart on 2011-11-17

- Fixed typo on login screen (LP: #890410).

239. By Natalia Bidart on 2011-11-14

Stable 3.0 development branch.

238. By Natalia Bidart on 2011-11-14

- Import qt4reactor properly (LP: #888722).

237. By Manuel de la Peña on 2011-10-31

Use setUp and tearDown correctly with twisted.trial.

236. By Alejandro J. Cura on 2011-10-07

Do a HEAD request on the server to get accurate timestamp (LP: #692597)

235. By Natalia Bidart on 2011-10-05

- Error message and dialog title updated (LP:#862991) (LP: #862540).

234. By Natalia Bidart on 2011-09-27

- Adding log files to apport hook (LP: #718196).