lp:~dobey/ubuntuone-control-panel/update-13-10

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-control-panel/stable-13-10 at revision 407

Roberto Alsina (community): Approve on 2013-09-17

Diff: 86 lines (+17/-7)

5 files modified

setup.py (+1/-1)
ubuntuone/controlpanel/__init__.py (+5/-1)
ubuntuone/controlpanel/backend.py (+8/-3)
ubuntuone/controlpanel/gui/__init__.py (+1/-1)
ubuntuone/controlpanel/tests/test_web_client.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

408. By dobey on 2013-09-18

Merge test fix.

407. By dobey on 2013-09-17

Merge changes from trunk for 13.09 release.

406. By dobey on 2013-08-05

[release] 13.08

405. By dobey on 2013-07-09

[release] 13.07

404. By dobey on 2013-07-09

[Rodney Dawes]

    Don't import APP_NAME from ubuntuone.clientdefs. Get it from SSO now.

403. By dobey on 2013-05-31

[release] 13.05

402. By Alejandro J. Cura on 2013-05-31

[Alejandro J. Cura]

    - Force a fake timestamp for the webclient tests (LP:#1186294).

[Rodney Dawes]

    - Fix pep8 warning.

401. By Mike McCracken on 2013-03-12

- Work around Qt issue where search files popup frame was not hidden after switching to another tab. (LP: #1152388)

400. By Mike McCracken on 2013-03-07

- Use Qt timers to delay and coalesce IPC for files search. (LP: #1150316)

399. By dobey on 2013-02-22

Append query arguments to the URI, rather than passing in as parameters.
Fix new pyflakes warnings about variable redefinition in list comprehensions.