summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-11-01Fold in changesTomás Touceda
2013-10-31Merge remote-tracking branch 'kali/fix-path-error' into developTomás Touceda
2013-10-31change error severityKali Kaneko
2013-10-31Merge remote-tracking branch 'drebs/bug/fix-dict-representation-for-python-2....Tomás Touceda
2013-10-31Fix dict representation so it works on python 2.6.drebs
2013-10-30Merge remote-tracking branch 'kali/add-freeze-debianver' into developTomás Touceda
2013-10-30add freeze_debianver commandKali Kaneko
2013-10-30Merge remote-tracking branch 'ivan-github/bug/4330_soledad-bootstrapping-prob...Kali Kaneko
2013-10-29Passphrase is already an unicode object.Ivan Alejandro
2013-10-28Merge remote-tracking branch 'drebs-github/feature/4097_allow-for-locking-cre...Kali Kaneko
2013-10-28Add shared db locking.drebs
2013-10-28Merge remote-tracking branch 'kali/feature/use-chardet-as-fallback' into developTomás Touceda
2013-10-28use chardet as fallbackKali Kaneko
2013-10-23Merge remote-tracking branch 'ivan/bug/4001_support-non-ascii-passwords' into...Tomás Touceda
2013-10-23Support use of non-ascii passwords.Ivan Alejandro
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 dev...Kali Kaneko
2013-10-03Convert to utf8 all the strings before saving themTomás Touceda
2013-09-30Merge remote-tracking branch 'remotes/kalikaneko/update-client-docstrings' in...drebs
2013-09-30Updates to client docstringsKali Kaneko
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' int...drebs
2013-09-18remove redundant loggingKali Kaneko
2013-09-18Merge remote-tracking branch 'drebs-github/bug/3647_improve-u1db-data-storage...Kali Kaneko
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
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' i...Tomás Touceda
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