summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-12Merge remote-tracking branch 'kali/feature/update-repo-in-docs' into developIvan Alejandro
2013-09-12Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/feature/improve-git-release-workflow' into develop
2013-09-12update to new git repo nameKali Kaneko
2013-09-12Update 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-12Merge remote-tracking branch 'kali/checklist-style' into developIvan Alejandro
2013-09-12Merge remote-tracking branch 'kali/feature/add-version-flag' into developIvan Alejandro
2013-09-12add checkboxesKali Kaneko
2013-09-12Merge remote-tracking branch 'ivan-github/feature/update-release-checklist' ↵Kali Kaneko
into develop
2013-09-12add --version flagKali Kaneko
2013-09-12Change 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-12remove duplicated dependencyKali Kaneko
2013-09-11Merge remote-tracking branch 'kali/hotfix/fix-keyring-dep' into developIvan Alejandro
2013-09-11Fix the format for the keyring requirementKali Kaneko
2013-09-11Merge remote-tracking branch 'kali/bug/remove-icons-from-resources' into developIvan Alejandro
2013-09-11remove unused icons from resourcesKali Kaneko
2013-09-11Merge branch 'develop' of ssh://leap.se/leap_client into developKali Kaneko
2013-09-11Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/bug/3791_prevent-last-window-close-app' into develop
2013-09-11Merge remote-tracking branch 'kali/hotfix/fix-first' into developIvan Alejandro
2013-09-11Prevent last window closing the app in tray.Ivan Alejandro
2013-09-11Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/bug/3714_fix-logger-saving-several-line-returns' into develop
2013-09-11catch indexerror on first utilityKali Kaneko
2013-09-10Merge remote-tracking branch 'kali/hotfix/do-not-install-globally' into developIvan Alejandro
2013-09-10do not try to install globally.Kali Kaneko
2013-09-10Fix LoggerWindow saving triple \n. Closes #3714.Ivan Alejandro
2013-09-10Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/feature/3758_improve-systray-tooltip' into develop
2013-09-09Make user messages more consistent.Ivan Alejandro
2013-09-09Merge remote-tracking branch 'kali/changelog-codename-0.3.2' into developIvan Alejandro
2013-09-09add codenameKali Kaneko
2013-09-09Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/bug/3617_remove-exec-bit-update-docs' into develop
2013-09-09Merge remote-tracking branch 'ivan-github/bug/3778_bundle-path-prefix' into ↵Kali Kaneko
develop
2013-09-09Fix path prefix helper for bundle and add test.Ivan Alejandro
2013-09-09Update release doc, remove exec bits. Closes #3617Ivan Alejandro
2013-09-09Improve systray tooltip.Ivan Alejandro
2013-09-07fix repo name in yet another placeKali Kaneko
2013-09-06fix license filenameKali Kaneko
2013-09-06Fold in changes.0.3.2Ivan Alejandro
2013-09-06Update requirements for 0.3.2Ivan Alejandro
2013-09-06Merge remote-tracking branch 'kali/feature/relnotes-0.3.2' into release-0.3.2Ivan Alejandro
2013-09-06bump relnotes to 0.3.2Kali Kaneko
2013-09-06Merge remote-tracking branch 'kali/feature/update-docs-to-0.3.2' into developIvan Alejandro
2013-09-06add x bitKali Kaneko
2013-09-06Hotfix: recursive rm and fetch before checkout.Ivan Alejandro
2013-09-05Merge remote-tracking branch 'kali/bug/workaround-keyring-version-problem' ↵Ivan Alejandro
into develop
2013-09-05Set keyring version to < 3.0 because of version compat probleKali Kaneko
2013-09-05Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/feature/3659_display-mx-status-in-tray' into develop
2013-09-05Merge remote-tracking branch 'kali/bug/re-add-mock-as-testing-dep' into developIvan Alejandro
2013-09-05re-add mock as testing depKali Kaneko
2013-09-05Display the mx status in the system tray.Ivan Alejandro
2013-09-05Merge remote-tracking branch 'ivan-github/bug/fix-test-release-version' into ↵Kali Kaneko
develop
2013-09-05Fix test checking is_release_version helper.Ivan Alejandro