Age | Commit message (Collapse) | Author |
|
|
|
This merge contains today's state of develop branch,
minus soledad and email components.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ObjectStore(InMemoryDatabase).
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
pkg/requirements.pip
|
|
|
|
|
|
improved default network request (771).
fixed ERROR "cannot concatenate 'str' and 'list' objects" (1449).
|
|
|
|
|
|
CouchDatabase now inherits from u1db InMemoryDatabase, so it can use all
available facilities. The important thing is to make sure every modification
of logs or indexes gets propagated to the ObjectStore backend.
|
|
and remove sip api setting from the qt smoke test
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|