lp://staging/~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntuone-control-panel/stable-3-0 at revision 245

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

Roberto Alsina (community): Approve on 2012-01-17

Diff: 376 lines (+288/-4)

8 files modified

ubuntuone/controlpanel/gui/qt/devices.py (+1/-0)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+4/-4)
ubuntuone/controlpanel/gui/qt/tests/test_devices.py (+22/-0)
ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py (+28/-0)
ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py (+29/-0)
ubuntuone/controlpanel/gui/qt/uniqueapp/tests/__init__.py (+17/-0)
ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_windows.py (+135/-0)
ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py (+52/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #862997: It's possible to open ubuntu one twice	Medium	Fix Released
Bug #904551: two remove buttons	Medium	Fix Released

Link a bug report

Related blueprints

246. By Natalia Bidart on 2012-01-17

[ Diego Sarmentero <email address hidden> ]
  - Fixed: two remove buttons (LP: #904551).

[ Robert Alsina <email address hidden> ]
  - Make control panel a unique instance app on windows (LP: #862997).

245. By Natalia Bidart on 2012-01-17

Merged trunk in up to revno 251.

244. By Natalia Bidart on 2012-01-03

- Release v2.99.1.

243. By Roberto Alsina on 2012-01-03

[ Diego Sarmentero <email address hidden> ]
  - Fix dirty reactor.
[ Roberto Alsina <email address hidden> ]
  - When selecting "Quit Ubuntu One" from the tray context menu,
    shutdown syncdaemon (LP: #908888).
  - Make addfolder open the file dialog in $HOME instead of in the
    working directory (LP: #906541).

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.