summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-19Merge branch 'develop' of ssh://leap.se/bitmask_client into developKali Kaneko
2013-09-19Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/bug/3656_generic-username-password-message' into develop
2013-09-19Merge remote-tracking branch 'ivan-github/feature/standalone-flag-to-module' ↵Kali Kaneko
into develop
2013-09-19Merge remote-tracking branch 'kwadronaut/develop' into developIvan Alejandro
2013-09-19Url change of downloadKwadroNaut
Actually there should still be a test if it fails!
2013-09-18Use generic username/password message.Ivan Alejandro
2013-09-18Move STANDALONE flag to a module and unify paths queries.Ivan Alejandro
2013-09-18Merge remote-tracking branch ↵Kali Kaneko
'ivan-github/feature/3792_systray-texts-improvements' into develop
2013-09-18Add changelog. Closes #3792.Ivan Alejandro
2013-09-18Move EIP status and action to submenu in tray.Ivan Alejandro
2013-09-18Update services' status texts.Ivan Alejandro
2013-09-18Remove the provider domain item from tray menu.Ivan Alejandro
2013-09-18Merge remote-tracking branch 'kali/bug/docs-update-dep-in-howto' into developIvan Alejandro
2013-09-18Merge remote-tracking branch 'kali/bug/workaround_keyring_imports' into developIvan Alejandro
2013-09-18Merge remote-tracking branch 'ivan-github/feature/proper-app-header' into ↵Kali Kaneko
develop
2013-09-18fix keyring problem with importsKali Kaneko
2013-09-18update obsolete qt4 depKali Kaneko
2013-09-18Remove unused existing code.Ivan Alejandro
2013-09-18Merge remote-tracking branch 'kali/bump-soledad-dep' into developIvan Alejandro
2013-09-18bump soledad version in next release requirementsKali Kaneko
2013-09-18Merge remote-tracking branch 'kali/bug/start_smtp_without_eip' into developIvan Alejandro
2013-09-18download cert for SMTP if EIP did not do it.Kali Kaneko
includes refactor of common code for download of certificates and config files.
2013-09-18Merge remote-tracking branch 'ivan-github/bug/3774_handle-logout-problem' ↵Kali Kaneko
into develop
2013-09-17Add a proper header for the app.py.Ivan Alejandro
2013-09-16Merge remote-tracking branch 'ivan-github/bug/3821_inconsistent-hide-show' ↵Kali Kaneko
into develop
2013-09-16Wait for visibility to change before update menu.Ivan Alejandro
2013-09-16Merge remote-tracking branch 'kali/bug/update-readme-to-latest-repo' into ↵Ivan Alejandro
develop
2013-09-16explicitely invoke python2Kali Kaneko
2013-09-16update readmeKali Kaneko
2013-09-16Merge remote-tracking branch 'kali/feature/update-metadata' into developIvan Alejandro
2013-09-16update metadata in setup.pyKali Kaneko
2013-09-13Handle correctly a logout problem. Closes #3774.Ivan Alejandro
Also remove preferences button disable, we don't need that.
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