bitmask_client.git - [bitmask

Age	Commit message (Collapse)	Author
2013-01-31	actually merge the release/v0.2.0 branch!	kali
	My life has been a lie until this moment... I had done: git merge -s ours release/v0.2.0 to avoid deleting the debian folder... but that left the src untouched... Now I just rm'd the src folder and did a git checkout release/v0.2.0 src/ ... and merge happy! :)
2013-01-31	Merge branch 'release/v0.2.0' into debian	kali

2013-01-31	bump version	kali

2013-01-31	remove unpackaged pygeoip dependency	kali

2013-01-30	rename manpage	kali
	I am also commiting the manpage itself temporarily, we should leave only the .rst in the repo!
2013-01-30	fill empty docs, were breaking sphixdoc dh step	kali

2013-01-30	rename manpage	kali
	I am also commiting the manpage itself temporarily, we should leave only the .rst in the repo!
2013-01-30	generate manpage?	kali

2013-01-30	fill empty docs, were breaking sphixdoc dh step	kali

2013-01-30	fix pep8 that was breaking pkg build	kali

2013-01-30	fix pep8 that was breaking pkg build	kali

2013-01-30	cleanup docs build	kali

2013-01-30	fix bad files from merge	kali

2013-01-30	merge data	kali

2013-01-30	merged pkg & docs	kali

2013-01-30	bumped version in changelog after v0.2.0 merge	kali

2013-01-30	Merge branch 'release/v0.2.0' into debian	kali

2013-01-30	add polkit file	kali

2013-01-30	missing setuptools dep	kali

2013-01-30	added policykit file	kali

2013-01-30	remove dummy info and fix typos	kali

2013-01-30	changed pkg name in placeholders	kali

2013-01-30	preliminary watch	kali

2013-01-30	Add correct text of the GPL-3	kali

2013-01-30	correct debian/copyright (gpl3)	kali

2013-01-30	Add correct text of the GPL-3	kali

2013-01-30	updated control file with new dependencies	kali

2013-01-30	add sphinxdocs to dh	kali

2013-01-30	Merge branch 'release-0.2.0' into release/v0.2.0	kali
	removing soledad + email from release branch created with git flow
2013-01-30	bump version	kali

2013-01-30	remove remaining soledad import	kali

2013-01-30	Merge branch 'pre-release-0.2.0' into release-0.2.0	kali
	This merge contains today's state of develop branch, minus soledad and email components.
2013-01-30	remove soledad / email requirements for 0.2 release	kali

2013-01-30	remove email and soledad components from tree	kali

2013-01-30	fix option not in use	kali

2013-01-30	add new assets for connection status	kali

2013-01-30	cosmetic fixes	kali

2013-01-30	remove copy data hook from setup	kali

2013-01-30	comment out unused arguments in the arg parser	kali

2013-01-30	add manpage in rst format	kali

2013-01-28	Merge branch 'feature/smtp-relay' into develop	drebs

2013-01-28	Remove hard coded file dependency.	drebs

2013-01-28	Fix pep8 style.	drebs

2013-01-28	Merge branch 'feature/smtp-relay' into develop	drebs

2013-01-28	Fix tests with PGP to use random dir.	drebs

2013-01-28	LeapSyncTarget checks whether document has been correctly encrypted.	drebs

2013-01-28	Merge branch 'feature/soledad-api' into develop	drebs

2013-01-28	CouchDB tests now run with their own couch instance on a random dir.	drebs

2013-01-27	Refactor tests and fix test_https.	drebs

2013-01-27	Merge branch 'feature/soledad-api' into develop	drebs