summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-04Merge branch 'release-0.4.1'0.4.1Tomás Touceda
2013-10-04Fold in changesTomás Touceda
2013-10-03Merge remote-tracking branch 'chiiph-github/bug/utf8_all_the_things' into ↵Kali Kaneko
develop
2013-10-03Convert to utf8 all the strings before saving themTomás Touceda
2013-09-30Merge remote-tracking branch 'remotes/kalikaneko/update-client-docstrings' ↵drebs
into develop
2013-09-30Updates to client docstringsKali Kaneko
* Add a more precise description of cert_file * change docstring placeholder to be compliant with sphinx rst
2013-09-20Merge branch 'release-0.4.0'0.4.0Ivan Alejandro
2013-09-20Fold in changes.Ivan Alejandro
2013-09-18Merge remote-tracking branch 'kalikaneko/feature/remove_unneeded_logging' ↵drebs
into develop
2013-09-18remove redundant loggingKali Kaneko
2013-09-18Merge remote-tracking branch ↵Kali Kaneko
'drebs-github/bug/3647_improve-u1db-data-storage-in-couch-2' into develop
2013-09-18Improve u1db data storage in couch.drebs
2013-09-18 Fix tests that leaked couch instances.drebs
2013-09-18Fix couchdb requirement.drebs
2013-09-18Remove pycrypto as test requirement.drebs
2013-09-18Add couch permission check.drebs
2013-09-16Merge remote-tracking branch 'kali/feature/reorder_scrypt_import' into developIvan Alejandro
2013-09-16reorder importsKali Kaneko
2013-09-12Fix changelogKali Kaneko
The last entries for common really belonged to 0.3.1
2013-09-06fix spacingKali Kaneko
2013-09-06Merge branch 'release-0.3.2' into developIvan Alejandro
2013-09-06Merge branch 'release-0.3.2'Ivan Alejandro
2013-09-06Fold in changes.0.3.2Ivan Alejandro
2013-09-04Merge remote-tracking branch 'chiiph/bug/fix_init_script' into developdrebs
2013-08-29Use soledad.server namespace in init scriptTomás Touceda
2013-08-28Merge remote-tracking branch 'ivan/feature/3574_use-dirspec-instead-of-xdg' ↵Tomás Touceda
into develop
2013-08-28Use dirspec instead of plain xdg. Closes #3574.Ivan Alejandro
2013-08-27Merge remote-tracking branch 'kali/bug/bypass-init-install' into developTomás Touceda
2013-08-27add bypass var for init filesKali Kaneko
2013-08-27Merge remote-tracking branch 'kali/hotfix/add_manifest_license'Tomás Touceda
2013-08-27add manifest.in and license to the 3 subprojectsKali Kaneko
2013-08-27Merge remote-tracking branch 'kali/hotfix/add_manifest_license' into developTomás Touceda
2013-08-26Merge remote-tracking branch 'kali/bug/more-descriptive' into developTomás Touceda
2013-08-26Merge remote-tracking branch 'kali/hotfix/remove-six-hard-dep' into developTomás Touceda
2013-08-26Add some notes about the package split.Kali Kaneko
* in description line * in readme * add each package crate icon and link.
2013-08-23Remove the hard-dep on sixKali Kaneko
It looks like it is no longer needed, but leaving it commented until we do some more tests.
2013-08-23Fold in changes0.3.1Tomás Touceda
2013-08-23Merge remote-tracking branch 'kali/feature/improve_packaging' into developTomás Touceda
2013-08-23packaging improvementsKali Kaneko
* add versioneer (patched for our particular repo config) * add parse_requirements to unify requirement handling
2013-08-22Merge remote-tracking branch 'kali/bug/really_remove_dbwrapper' into developTomás Touceda
2013-08-22remove unused dbwrapperKali Kaneko
2013-08-21Merge remote-tracking branch ↵Tomás Touceda
'drebs/feature/3487_split-soledad-into-common-client-and-server-3' into develop
2013-08-21Update README with info on how to run tests.drebs
2013-08-21Fix test using new rand prefix.drebs
2013-08-21Split soledad into common, client and server.drebs
2013-08-21fix tests to dbwrapper removalKali Kaneko
2013-08-21Remove DBWRAPPER for sqlcipher access.Kali Kaneko
We're using instead the very useful but undocumented check_same_thread parameter in dbapi2.connect, plus class level locks when accessing a sqlcipher database.
2013-08-21fixes so we can execute some tests on its ownKali Kaneko
2013-08-21moar fix attempts using class lockKali Kaneko
2013-08-21Workarounds for sqlcipher concurrent init on testsKali Kaneko