summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 ↵Tomás Touceda
'refs/remotes/ivan/feature/single-provider-at-a-time' into develop
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-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
2014-08-06Merge remote-tracking branch 'refs/remotes/ivan/bug/pastebin-does-not-work' ↵Tomás Touceda
into develop
2014-08-06Replace twisted thread with QThread.Ivan Alejandro
This fix the bug that prevents pastebin to work. Closes #5949.
2014-08-06Merge remote-tracking branch ↵kali
'ivan-github/bug/use-smaller-window-to-fit-lower-resolutions' into develop
2014-08-06fix uncatched error with missing polkit. Closes: #5955kali
2014-08-05Reduce height to fit on smaller resolutions.Ivan Alejandro
Closes #5722.
2014-08-04Merge branch 'bug/enable-child-process-in-backend' into developdrebs
2014-08-04Disable daemon mode, we use processes in the backend.Ivan Alejandro
2014-08-02Merge remote-tracking branch 'refs/remotes/kali/feature/pseudo-cancel-eip' ↵Tomás Touceda
into develop
2014-08-01Add cancel button for EIP connection.kali
Closes: #4035 This falls in the "quick" workaround category. A proper state machine that extends the four basic connection states is hence needed. We have to accomodate design to have a connection-oriented state machine in the backend (I would favor a twisted protocol for this), and a more lightweight one that conducts the gui-level changes (ie, change the actions / buttons / labels accordingly). Since this "cancel" functionality has been long postponed, I chose to do one more ugly hack here, that is, show and hide dance with a button that just calls the bitmask-root to kill the vpn process. It should work well enough until we get to the reorganization needed for a clean process control for eip.
2014-07-31Merge remote-tracking branch 'chiiph/bug/more_keyring_fixes' into developIvan Alejandro
2014-07-31Do not default to SecretService keyringTomás Touceda
2014-07-31Merge remote-tracking branch 'chiiph/bug/properly_enable_keyring' into developIvan Alejandro
2014-07-31Enable keyring againTomás Touceda
2014-07-31Merge remote-tracking branch 'refs/remotes/ivan/bug/fix-system-logout-block' ↵Tomás Touceda
into develop
2014-07-31Handle the system's quit correctly.Ivan Alejandro
Use a simple sleep to wait until the services are stopped and then kill the backend, always in a fixed time in order to avoid blocks/hangs on the system session logout. Closes #5870.
2014-07-30Reduce services stop timeout.Ivan Alejandro
2014-07-28Merge remote-tracking branch ↵Tomás Touceda
'refs/remotes/ivan/bug/5870_bitmask-prevent-system-logout-on-linux' into develop
2014-07-28Do `quit()` if the system requested the app to close.Ivan Alejandro
This fixes the issue where a system logout was blocked by bitmask since we were interpreting the closeEvent as if the user clicked on the 'X' button. Closes #5870.
2014-07-25Merge remote-tracking branch 'refs/remotes/kali/bug/fix-imports' into developTomás Touceda
2014-07-25bump bitmask-root version numberkali