bitmask_client.git - [bitmask

Age	Commit message (Collapse)	Author
2013-09-16	Merge remote-tracking branch 'kali/feature/update-metadata' into develop	Ivan Alejandro

2013-09-16	update metadata in setup.py	Kali Kaneko

2013-09-13	Handle correctly a logout problem. Closes #3774.	Ivan Alejandro
	Also remove preferences button disable, we don't need that.
2013-09-12	Merge remote-tracking branch 'kali/feature/update-repo-in-docs' into develop	Ivan Alejandro

2013-09-12	Merge remote-tracking branch ↵	Kali Kaneko
	'ivan-github/feature/improve-git-release-workflow' into develop
2013-09-12	update to new git repo name	Kali Kaneko

2013-09-12	Update instructions to improve release process.	Ivan Alejandro
	This allows us to have master and develop in sync after the release. Also get a correct and clean version report. I've included the `-m` switch in the `git tag` command so we avoid to open an editor and let us closer to make a script to automate this.
2013-09-12	Merge remote-tracking branch 'kali/debian-0.3.2' into debian	Micah Anderson

2013-09-12	Merge remote-tracking branch 'kali/checklist-style' into develop	Ivan Alejandro

2013-09-12	Merge remote-tracking branch 'kali/feature/add-version-flag' into develop	Ivan Alejandro

2013-09-12	add checkboxes	Kali Kaneko

2013-09-12	Merge remote-tracking branch 'ivan-github/feature/update-release-checklist' ↵	Kali Kaneko
	into develop
2013-09-12	add --version flag	Kali Kaneko

2013-09-12	Change the order of the actions in the release.	Ivan Alejandro
	With this change we are following more accurately: http://nvie.com/posts/a-successful-git-branching-model/ Also, we achieve a clean version in master. If we do the tag before the merge in master, then we would have an extra commit after the tagging, which causes version to be X.Y.Z-1-blah.
2013-09-12	update to 0.3.2	Kali Kaneko

2013-09-12	Merge branch 'master' into debian	Kali Kaneko
	Conflicts: pkg/requirements.pip setup.py
2013-09-12	remove duplicated dependency	Kali Kaneko

2013-09-12	remove duplicated dependency	Kali Kaneko

2013-09-12	Fix the format for the keyring requirement	Kali Kaneko

2013-09-11	Merge remote-tracking branch 'kali/hotfix/fix-keyring-dep' into develop	Ivan Alejandro

2013-09-11	Fix the format for the keyring requirement	Kali Kaneko

2013-09-11	do not try to install globally.	Kali Kaneko

2013-09-11	catch indexerror on first utility	Kali Kaneko

2013-09-11	Merge remote-tracking branch 'kali/bug/remove-icons-from-resources' into develop	Ivan Alejandro

2013-09-11	remove unused icons from resources	Kali Kaneko

2013-09-11	Merge branch 'develop' of ssh://leap.se/leap_client into develop	Kali Kaneko

2013-09-11	Merge remote-tracking branch ↵	Kali Kaneko
	'ivan-github/bug/3791_prevent-last-window-close-app' into develop
2013-09-11	Merge remote-tracking branch 'kali/hotfix/fix-first' into develop	Ivan Alejandro

2013-09-11	Prevent last window closing the app in tray.	Ivan Alejandro

2013-09-11	Merge remote-tracking branch ↵	Kali Kaneko
	'ivan-github/bug/3714_fix-logger-saving-several-line-returns' into develop
2013-09-11	catch indexerror on first utility	Kali Kaneko

2013-09-11	Fix path prefix helper for bundle and add test.	Ivan Alejandro

2013-09-10	Merge remote-tracking branch 'kali/hotfix/do-not-install-globally' into develop	Ivan Alejandro

2013-09-10	do not try to install globally.	Kali Kaneko

2013-09-10	Fix LoggerWindow saving triple \n. Closes #3714.	Ivan Alejandro

2013-09-10	Merge remote-tracking branch ↵	Kali Kaneko
	'ivan-github/feature/3758_improve-systray-tooltip' into develop
2013-09-09	Make user messages more consistent.	Ivan Alejandro

2013-09-09	Merge remote-tracking branch 'kali/changelog-codename-0.3.2' into develop	Ivan Alejandro

2013-09-09	add codename	Kali Kaneko

2013-09-09	Merge remote-tracking branch ↵	Kali Kaneko
	'ivan-github/bug/3617_remove-exec-bit-update-docs' into develop
2013-09-09	Merge remote-tracking branch 'ivan-github/bug/3778_bundle-path-prefix' into ↵	Kali Kaneko
	develop
2013-09-09	Fix path prefix helper for bundle and add test.	Ivan Alejandro

2013-09-09	Update release doc, remove exec bits. Closes #3617	Ivan Alejandro

2013-09-09	Improve systray tooltip.	Ivan Alejandro

2013-09-07	fix repo name in yet another place	Kali Kaneko

2013-09-06	fix license filename	Kali Kaneko

2013-09-06	Fold in changes.0.3.2	Ivan Alejandro

2013-09-06	Update requirements for 0.3.2	Ivan Alejandro

2013-09-06	Merge remote-tracking branch 'kali/feature/relnotes-0.3.2' into release-0.3.2	Ivan Alejandro

2013-09-06	bump relnotes to 0.3.2	Kali Kaneko