summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-16patch the _version file so it reports the running versionKali Kaneko
until now this was only possible when running python setup.py version from the source tree. now the <module>.__version__ also reports correctly the runnng version
2013-12-13Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/kali/feature/expand-sqlicipher-capabilities' into develop
2013-12-13Merge remote-tracking branch 'refs/remotes/kali/feature/enable-gzip' into ↵Tomás Touceda
develop
2013-12-13get_count_from_indexKali Kaneko
2013-12-13enable gzip compressionKali Kaneko
2013-12-12Merge remote-tracking branch 'chiiph/bug/unlock_shared_if_failed' into developIvan Alejandro
2013-12-12Unlock shared db if bootstrapping fails in any wayTomás Touceda
2013-12-09Merge remote-tracking branch 'kali/bug/pep8_cleanup' into developIvan Alejandro
2013-12-09pep8 happyKali Kaneko
2013-12-06Merge branch 'release-0.4.4'0.4.4Tomás Touceda
2013-12-06Fold in changesTomás Touceda
2013-12-06Merge remote-tracking branch 'chiiph/bug/revert_database_creation' into developIvan Alejandro
2013-12-06Merge remote-tracking branch 'remotes/kalikaneko/feature/develop_mode' into ↵drebs
develop
2013-12-06add entry point for testsKali Kaneko
2013-12-06Merge remote-tracking branch 'remotes/kalikaneko/feature/develop_mode' into ↵drebs
develop
2013-12-06add develop mode mini-script for bbot useKali Kaneko
2013-12-05Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/drebs/revert-couch-u1db-doc-id-encoding' into develop
2013-12-05Revert "Encode U1DB metadata doc prefix. Closes #4658."drebs
This reverts commit 6792e50606e33f10c12f16b0d7d7aeb87d4a4adb.
2013-12-05Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/kali/feature/add-venwwrapper-script' into develop
2013-12-05add venwrapper script for testsKali Kaneko
2013-12-04Merge remote-tracking branch 'drebs/bug/encode-u1db-metadata-doc-prefix' ↵Tomás Touceda
into develop
2013-12-04Revert "Remove creation of shared database from soledad server code. Closes ↵Tomás Touceda
#4566." This reverts commit eb07702bc4c1d51e0307b655b14bc1a3835488b2.
2013-12-04Revert "Stop creating per-user databases. Closes #4626."Tomás Touceda
This reverts commit 6eeed5c116d38ebae7d9309dd2f11660f6cff37e.
2013-12-04Encode U1DB metadata doc prefix. Closes #4658.drebs
2013-11-29Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/drebs/feature/4626_stop-creating-per-user-databases' into develop
2013-11-29Stop creating per-user databases. Closes #4626.drebs
2013-11-25Merge remote-tracking branch 'drebs/bug/4258_remove-dependency-on-nose2' ↵Ivan Alejandro
into develop
2013-11-21Remove tests dependency on nose2. Closes #4258.drebs
2013-11-21Merge remote-tracking branch ↵Tomás Touceda
'drebs/bug/4095_add-unicode-conversion-to-put_doc' into develop
2013-11-21Add scripts for debugging client and server side databases.drebs
2013-11-21Remove creation of shared database from soledad server code. Closes #4566.drebs
2013-11-21Add unicode conversion to put_doc. Closes #4095.drebs
2013-11-19Merge remote-tracking branch ↵Tomás Touceda
'drebs/feature/4348_add-mac-verification-to-recovery-doc' into develop
2013-11-19Add MAC verification to recovery document. Closes #4348.drebs
2013-11-15Fix changelogTomás Touceda
2013-11-15Merge branch 'release-0.4.3'0.4.3Tomás Touceda
2013-11-15Fold in changesTomás Touceda
2013-11-08Merge remote-tracking branch 'kali/bug/default-detected-encoding-to-utf8' ↵Tomás Touceda
into develop
2013-11-08default detected encoding to utf-8Kali Kaneko
2013-11-07Merge remote-tracking branch 'kalikaneko/bug/open-db-in-autocommit-mode' ↵drebs
into develop
2013-11-07open db in autocommit modeKali Kaneko
2013-11-04Merge remote-tracking branch 'kali/add-debian-notes' into developTomás Touceda
2013-11-01Merge branch 'release-0.4.2'0.4.2Tomás Touceda
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 ↵Tomás Touceda
'drebs/bug/fix-dict-representation-for-python-2.6' into develop
2013-10-31Fix dict representation so it works on python 2.6.drebs
2013-10-31notes for repackagingKali Kaneko
2013-10-30Merge remote-tracking branch 'kali/add-freeze-debianver' into developTomás Touceda