summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-12Update version to 0.3.2, add python-dirspec dependencyKali Kaneko
2013-09-12Fix changelogKali Kaneko
The last entries for common really belonged to 0.3.1
2013-09-12Merge tag '0.3.2' into debianKali Kaneko
Tag leap.soledad version 0.3.2
2013-09-06Fold in changes.0.3.2Ivan Alejandro
2013-09-04Merge remote-tracking branch 'chiiph/bug/fix_init_script' into developdrebs
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' ↵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-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
Debian rel0.3.1
2013-08-27updated changelogKali Kaneko
2013-08-26Remove 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-26Fix pydist-overridesKali Kaneko
2013-08-26bump versionKali Kaneko
2013-08-26Merge tag '0.3.1' into debian-rel0.3.1Kali Kaneko
Tag leap.soledad version 0.3.1
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-22update dependencies and create new binary packageMicah Anderson
2013-08-22Merge remote-tracking branch 'origin/develop' into debianMicah Anderson
Conflicts: client/src/leap/__init__.py client/src/leap/soledad/client/__init__.py client/src/leap/soledad/client/auth.py client/src/leap/soledad/client/crypto.py client/src/leap/soledad/client/shared_db.py client/src/leap/soledad/client/sqlcipher.py client/src/leap/soledad/client/target.py common/src/leap/soledad/common/couch.py common/src/leap/soledad/common/crypto.py common/src/leap/soledad/common/objectstore.py common/src/leap/soledad/common/tests/__init__.py common/src/leap/soledad/common/tests/couchdb.ini.template common/src/leap/soledad/common/tests/test_couch.py common/src/leap/soledad/common/tests/test_server.py common/src/leap/soledad/common/tests/test_soledad.py common/src/leap/soledad/common/tests/test_sqlcipher.py common/src/leap/soledad/common/tests/test_target.py common/src/leap/soledad/common/tests/u1db_tests/README common/src/leap/soledad/common/tests/u1db_tests/__init__.py common/src/leap/soledad/common/tests/u1db_tests/test_backends.py common/src/leap/soledad/common/tests/u1db_tests/test_document.py common/src/leap/soledad/common/tests/u1db_tests/test_http_app.py common/src/leap/soledad/common/tests/u1db_tests/test_http_client.py common/src/leap/soledad/common/tests/u1db_tests/test_http_database.py common/src/leap/soledad/common/tests/u1db_tests/test_https.py common/src/leap/soledad/common/tests/u1db_tests/test_open.py common/src/leap/soledad/common/tests/u1db_tests/test_remote_sync_target.py common/src/leap/soledad/common/tests/u1db_tests/test_sqlite_backend.py common/src/leap/soledad/common/tests/u1db_tests/test_sync.py common/src/leap/soledad/common/tests/u1db_tests/testing-certs/Makefile common/src/leap/soledad/common/tests/u1db_tests/testing-certs/cacert.pem common/src/leap/soledad/common/tests/u1db_tests/testing-certs/testing.cert common/src/leap/soledad/common/tests/u1db_tests/testing-certs/testing.key pkg/soledad server/pkg/soledad server/setup.py server/src/leap/soledad/server/auth.py setup.py soledad/setup.py soledad/src/leap/__init__.py soledad/src/leap/soledad/__init__.py soledad/src/leap/soledad/auth.py soledad/src/leap/soledad/crypto.py soledad/src/leap/soledad/shared_db.py soledad/src/leap/soledad/sqlcipher.py soledad/src/leap/soledad/target.py soledad/src/leap/soledad/tests/__init__.py soledad/src/leap/soledad/tests/couchdb.ini.template soledad/src/leap/soledad/tests/test_couch.py soledad/src/leap/soledad/tests/test_crypto.py soledad/src/leap/soledad/tests/test_server.py soledad/src/leap/soledad/tests/test_soledad.py soledad/src/leap/soledad/tests/test_sqlcipher.py soledad/src/leap/soledad/tests/test_target.py soledad/src/leap/soledad/tests/u1db_tests/README soledad/src/leap/soledad/tests/u1db_tests/__init__.py soledad/src/leap/soledad/tests/u1db_tests/test_backends.py soledad/src/leap/soledad/tests/u1db_tests/test_document.py soledad/src/leap/soledad/tests/u1db_tests/test_http_app.py soledad/src/leap/soledad/tests/u1db_tests/test_http_client.py soledad/src/leap/soledad/tests/u1db_tests/test_http_database.py soledad/src/leap/soledad/tests/u1db_tests/test_https.py soledad/src/leap/soledad/tests/u1db_tests/test_open.py soledad/src/leap/soledad/tests/u1db_tests/test_remote_sync_target.py soledad/src/leap/soledad/tests/u1db_tests/test_sqlite_backend.py soledad/src/leap/soledad/tests/u1db_tests/test_sync.py soledad/src/leap/soledad/tests/u1db_tests/testing-certs/Makefile soledad/src/leap/soledad/tests/u1db_tests/testing-certs/cacert.pem soledad/src/leap/soledad/tests/u1db_tests/testing-certs/testing.cert soledad/src/leap/soledad/tests/u1db_tests/testing-certs/testing.key soledad_server/pkg/soledad soledad_server/src/leap/soledad_server/auth.py soledad_server/src/leap/soledad_server/couch.py soledad_server/src/leap/soledad_server/objectstore.py src/leap/__init__.py src/leap/soledad/__init__.py src/leap/soledad/auth.py src/leap/soledad/backends/couch.py src/leap/soledad/backends/leap_backend.py src/leap/soledad/backends/objectstore.py src/leap/soledad/backends/sqlcipher.py src/leap/soledad/crypto.py src/leap/soledad/server.py src/leap/soledad/shared_db.py src/leap/soledad/tests/__init__.py src/leap/soledad/tests/couchdb.ini.template src/leap/soledad/tests/test_couch.py src/leap/soledad/tests/test_leap_backend.py src/leap/soledad/tests/test_server.py src/leap/soledad/tests/test_soledad.py src/leap/soledad/tests/test_sqlcipher.py src/leap/soledad/tests/u1db_tests/README src/leap/soledad/tests/u1db_tests/__init__.py src/leap/soledad/tests/u1db_tests/test_backends.py src/leap/soledad/tests/u1db_tests/test_document.py src/leap/soledad/tests/u1db_tests/test_http_app.py src/leap/soledad/tests/u1db_tests/test_http_client.py src/leap/soledad/tests/u1db_tests/test_http_database.py src/leap/soledad/tests/u1db_tests/test_https.py src/leap/soledad/tests/u1db_tests/test_open.py src/leap/soledad/tests/u1db_tests/test_remote_sync_target.py src/leap/soledad/tests/u1db_tests/test_sqlite_backend.py src/leap/soledad/tests/u1db_tests/test_sync.py src/leap/soledad/tests/u1db_tests/testing-certs/Makefile src/leap/soledad/tests/u1db_tests/testing-certs/cacert.pem src/leap/soledad/tests/u1db_tests/testing-certs/testing.cert src/leap/soledad/tests/u1db_tests/testing-certs/testing.key
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
2013-08-21add swaps to gitignoreKali Kaneko