lp://qastaging/~barry/ubuntuone-control-panel/use-json

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntuone-control-panel at revision 380

dobey (community): Approve on 2012-11-08

Diff: 49 lines (+4/-5)

2 files modified

ubuntuone/controlpanel/tests/test_backend.py (+2/-3)
ubuntuone/controlpanel/web_client.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1029094: Replace simplejson with json

Undecided

Fix Released

Link a bug report

Related blueprints

339. By Barry Warsaw on 2012-11-08

trunk merge

338. By Barry Warsaw on 2012-07-25

Replace the third party simplejson module with the stdlib json module.

337. By Mike McCracken on 2012-07-05

- Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)

336. By Diego Sarmentero on 2012-07-04

- Replacing side widget logo (LP: #1020187).

335. By Mike McCracken on 2012-06-28

- On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)

334. By dobey on 2012-06-22

Get the log directory from the platform logging module

333. By Mike McCracken on 2012-06-18

- use qt4reactor on darwin (lp:1013820)

332. By Mike McCracken on 2012-06-15

- use twisted reactor main loop on darwin as on windows (lp:1012887)

331. By Mike McCracken on 2012-06-12

- add support for tests on darwin, warn about missing xvfb instead of quiet exit ( LP #1010211 )

330. By Roberto Alsina on 2012-06-08

 - Enable folder list sorting (Fixes LP:1006385).