summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-10-15bump changelog to 0.4.1Kali Kaneko
2013-09-24Merge tag '0.4.0' into debian-0.4.0Kali Kaneko
2013-09-24bump version to 0.4.0Kali 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-12Merge remote-tracking branch 'kali/debian-0.3.2' into debianMicah Anderson
2013-09-12Update version to 0.3.2, add python-dirspec dependencyKali Kaneko
2013-09-12Fix changelogKali Kaneko
2013-09-12Fix changelogKali Kaneko
2013-09-12Merge tag '0.3.2' into debianKali 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-29add fix to debian initscript to use new namespaceMicah Anderson
2013-08-29Merge remote-tracking branch 'kali/bug/fix-namespace' into debianMicah Anderson
2013-08-29Use soledad.server namespace in init scriptTomás Touceda
2013-08-29Merge branch 'master' into bug/fix-namespaceKali Kaneko
2013-08-29add changelogKali Kaneko
2013-08-29ignore more debian stuffKali Kaneko
2013-08-29fix namespaceKali Kaneko
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-27add bypass var for init filesKali Kaneko
2013-08-27skip init files install for soledad-serverKali Kaneko
2013-08-27fix syntax error introduced in commit to disable initscript installationMicah Anderson
2013-08-27update changelog for setup.py fixMicah Anderson
2013-08-27disable setup.py from installing initscript so the packaging can handle itMicah Anderson
2013-08-27Merge pull request #66 from kalikaneko/debian-rel0.3.1micah
2013-08-27updated changelogKali Kaneko
2013-08-26Remove the hard-dep on sixKali Kaneko
2013-08-26Fix pydist-overridesKali Kaneko
2013-08-26bump versionKali Kaneko
2013-08-26Merge tag '0.3.1' into debian-rel0.3.1Kali Kaneko