summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2013-10-30add freeze_debianver commandKali Kaneko
2013-10-30Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/bug/4330_soledad-bootstrapping-problem' into develop
2013-10-29Passphrase is already an unicode object.Ivan Alejandro
As we enforce to have the passphrase as an unicode object, we no longer need this conversion. [Related to bug #4330]
2013-10-28Merge remote-tracking branch ↵Kali Kaneko
'drebs-github/feature/4097_allow-for-locking-creation-of-secrets-in-server' into develop
2013-10-28Add shared db locking.drebs
* Improve bootstrap sequence: - stages are more organized. - there are less useless requests to server. * Improve shared db access: - instantiate the shared db only once. - also results in less requests to server. * Handle unicode passphrases. * Move some common functions and global variables to common. * Improve security of recovery document: - access to the recovery document now depends on the user password. * Improve documentation.
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' ↵Tomás Touceda
into develop
2013-10-23Support use of non-ascii passwords.Ivan Alejandro
[Closes #4001]
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