← Back to branch summary

~sil/desktopcouch/create-oauth-tokens-startup

~sil/desktopcouch/create-oauth-tokens-startup

Viewing all changes in revision 34.

Committer: stuart.langridge at canonical
Date: 2009-08-19 16:00:01 UTC
mfrom: (28.1.10 trunk)
Revision ID: stuart.langridge@canonical.com-20090819160001-18byr33zehjs8e67

merge from trunk, tidy up conflicts

files added:
desktopcouch/contacts

desktopcouch/contacts/__init__.py

desktopcouch/contacts/contactspicker.py

desktopcouch/contacts/record.py

desktopcouch/contacts/schema.txt

desktopcouch/contacts/testing

desktopcouch/contacts/testing/__init__.py

desktopcouch/contacts/testing/create.py

desktopcouch/contacts/tests

desktopcouch/contacts/tests/__init__.py

desktopcouch/contacts/tests/test_record.py

desktopcouch/stop_local_couchdb.py

files modified:
bin/desktopcouch-service

desktopcouch/__init__.py

desktopcouch/records/couchwidget.py

desktopcouch/records/server.py

desktopcouch/records/tests/test_field_registry.py

desktopcouch/records/tests/test_record.py

desktopcouch/records/tests/test_server.py *

desktopcouch/start_local_couchdb.py *

setup.py

Show diffs side-by-side

added added

removed removed

bin/desktopcouch-service

desktopcouch/__init__.py

desktopcouch/contacts/

desktopcouch/contacts/__init__.py

desktopcouch/contacts/contactspicker.py

desktopcouch/contacts/record.py

desktopcouch/contacts/schema.txt

desktopcouch/contacts/testing/

desktopcouch/contacts/testing/__init__.py

desktopcouch/contacts/testing/create.py

desktopcouch/contacts/tests/

desktopcouch/contacts/tests/__init__.py

desktopcouch/contacts/tests/test_record.py

desktopcouch/records/couchwidget.py

desktopcouch/records/server.py

desktopcouch/records/tests/test_field_registry.py

desktopcouch/records/tests/test_record.py

desktopcouch/records/tests/test_server.py

desktopcouch/start_local_couchdb.py

desktopcouch/stop_local_couchdb.py

Older »