lp://qastaging/~vds/desktopcouch/again_python_couchdb

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/desktopcouch at revision 234

Chad Miller (community): Approve on 2010-11-25

Manuel de la Peña (community): Approve on 2010-11-22

Eric Casteleijn (community): Approve on 2010-11-18

Diff: 1043 lines (+376/-222)

20 files modified

desktopcouch/application/local_files.py (+1/-1)
desktopcouch/application/migration/__init__.py (+3/-1)
desktopcouch/application/migration/tests/test_migration.py (+18/-1)
desktopcouch/application/pair/couchdb_pairing/couchdb_io.py (+7/-15)
desktopcouch/application/pair/couchdb_pairing/ubuntuone_pairing.py (+2/-8)
desktopcouch/application/platform/__init__.py (+1/-0)
desktopcouch/application/platform/linux/base_dirs.py (+1/-0)
desktopcouch/application/server.py (+12/-19)
desktopcouch/application/service.py (+2/-1)
desktopcouch/bookmarks/__init__.py (+0/-1)
desktopcouch/bookmarks/record.py (+0/-9)
desktopcouch/notes/__init__.py (+0/-1)
desktopcouch/notes/record.py (+0/-9)
desktopcouch/records/database.py (+38/-129)
desktopcouch/records/http.py (+266/-0)
desktopcouch/records/tests/test_server.py (+19/-7)
desktopcouch/recordtypes/contacts/testing/create.py (+6/-2)
desktopcouch/recordtypes/contacts/view.py (+0/-8)
desktopcouch/tasks/__init__.py (+0/-1)
desktopcouch/tasks/record.py (+0/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #675551: Port desktopcouch to the most update version of python-couchdb	High	Fix Released
Bug #676986: Attachment test need refactoring	Medium	Fix Released

Link a bug report

Related blueprints

227. By Vincenzo Di Somma on 2010-12-01

merged trunk, resolved conflicts

226. By Vincenzo Di Somma on 2010-11-26

pep8 now happy

225. By Vincenzo Di Somma on 2010-11-26

no deleted flag checks anymore

224. By Vincenzo Di Somma on 2010-11-26

migration finally done

223. By Vincenzo Di Somma on 2010-11-26

merged trunk once

222. By Vincenzo Di Somma on 2010-11-23

again conflicts, again fixed

221. By Vincenzo Di Somma on 2010-11-23

I shouldn't have removed that

220. By Vincenzo Di Somma on 2010-11-23

I shouldn't have removed that

219. By Vincenzo Di Somma on 2010-11-23

making pylint happy as much as possible

218. By Vincenzo Di Somma on 2010-11-23

merged with trunk