summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-19make the login not wait for eip it cannot-start-eipKali Kaneko
2014-08-15freeze debian versionKali Kaneko
2014-08-15update changelog to 0.6.1 finalKali Kaneko
2014-08-15Merge tag '0.6.1' into deb-0.6.1Kali Kaneko
Tag leap.bitmask version 0.6.1
2014-08-15Merge branch 'release-0.6.1'0.6.1Tomás Touceda
2014-08-15Fold in changes and update relnotesTomás Touceda
2014-08-14Merge remote-tracking branch 'refs/remotes/elijah/feature/provider-on-top' ↵Tomás Touceda
into develop
2014-08-14moved provider selection popup menu to be at the top of the main windowelijah
2014-08-14Merge remote-tracking branch 'refs/remotes/ivan/bug/esc-default-to-no' into ↵Tomás Touceda
develop
2014-08-14more specific library dependencieskali
2014-08-14Default to No if ESC pressed on 'install helper files'.Ivan Alejandro
Closes #5819.
2014-08-14Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/use-same-user-and-pass-restrictions-as-in-the-webapp' into develop
2014-08-13Use same user/password restrictions as in the webapp.Ivan Alejandro
- no uppercase allowed in usernames, - password length min to 8 Closes #5894.
2014-08-13Merge remote-tracking branch 'refs/remotes/ivan/feature/update-changes-file' ↵Tomás Touceda
into develop
2014-08-13Add issues fixed on the changes file.Ivan Alejandro
2014-08-13Merge remote-tracking branch 'kali/deb-0.6.1-rc2' into debianMicah Anderson
2014-08-13freeze debian version to ~rc2 after develop merge.kali
2014-08-13Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/feature/single-provider-at-a-time' into develop
2014-08-13freeze debian version to ~rc2 after develop merge.kali
2014-08-13Merge branch 'develop' into deb-0.6.1-rckali
2014-08-13Add changes file. Related to #4704.Ivan Alejandro
2014-08-13Ask for services stop when the wizard is needed.Ivan Alejandro
2014-08-13Stop the services if the selected provider is changed.Ivan Alejandro
Store the last 2 indexes on a deque and improve the 'select previous provider' action.
2014-08-13Merge remote-tracking branch 'refs/remotes/elijah/bugfix/flags' into developTomás Touceda
2014-08-12fix missing country flagselijah
2014-08-12Do some pep8 fixes.Ivan Alejandro
2014-08-11We do not have eipstatus.qrc anymoreTomás Touceda
2014-08-11Merge remote-tracking branch 'refs/remotes/elijah/feature/iconcleanup' into ↵Tomás Touceda
develop
2014-08-11added more country flagselijah
2014-08-11used 22x22 pixel icons instead of 24x24 pixel icons (since ubuntu needs 22 ↵elijah
anyway)
2014-08-11removed unused iconselijah
2014-08-11temporarily switch back to using png iconselijah
2014-08-11Merge remote-tracking branch 'refs/remotes/elijah/feature/minorui' into developTomás Touceda
2014-08-11Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/meskio/bug/wait-for-eip-to-autologin' into develop
2014-08-11Wait until EIP is up to autologin. Closes #5939.Ruben Pollan
2014-08-10svg icons! well, how about that?elijah
2014-08-10clean up icons in mainwindow.qrcelijah
2014-08-10simplify wizard instructionselijah
2014-08-10added non-functional decorative footerelijah
2014-08-10properly align login and logout buttonselijah
2014-08-10remove "Hide Main Window" -- much better UX, less buggy, and makes it ↵elijah
possible raise window when it is obscured. To hide, just close window.
2014-08-10Clean up help dialog text.elijah
2014-08-09Merge remote-tracking branch 'kali/remove-old-comment' into developRuben Pollan
2014-08-08freeze debian versionkali
2014-08-08bump changelog to 0.6.1 releasekali
2014-08-08Merge branch '0.6.1-rc' into deb-0.6.1-rckali
Conflicts: pkg/linux/bitmask-root src/leap/bitmask/gui/login.py
2014-08-08remove outdated commentkali
eip machine was already moved into conductor
2014-08-06Merge remote-tracking branch 'refs/remotes/ivan/bug/logger-hangs-quit' into ↵Tomás Touceda
develop
2014-08-06Fix logger window blocking the bitmask quit().Ivan Alejandro
- Set the logger window parent, - don't use an mainwindow instance variable to hold the window object. This fix have the side offect that prevent multiple log windows being created at the same time, but it does not causes any side effect or problem.
2014-08-06Merge remote-tracking branch 'refs/remotes/kali/bug/fix-bad-eip-status' into ↵Tomás Touceda
develop