summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-15disable soledad bootstrapperkali
2013-06-15Merge branch 'develop' of ssh://leap.se/leap_client into developkali
2013-06-15Merge remote-tracking branch 'chiiph/bug/true_threading' into developkali
Closes #2848
2013-06-14Merge remote-tracking branch 'ivan/bug/2871_fix-logger-history' into developTomás Touceda
2013-06-14Bugfix: add logs to history. Closes #2871.Ivan Alejandro
2013-06-14Merge remote-tracking branch 'ivan/feature/2790_autoselect-vpn-gateway_rev1' ↵Tomás Touceda
into develop
2013-06-14Actually deferToThread all the things we expect to do in parallelTomás Touceda
2013-06-14Autoselect VPN gateway based on timezone.Ivan Alejandro
2013-06-14Merge remote-tracking branch 'chiiph/bug/improve_error_msgs' into developIvan Alejandro
2013-06-14Merge branch 'bug/fix_wrong_status_call' into developIvan Alejandro
2013-06-14Merge remote-tracking branch 'chiiph/bug/fix_eip_status_call' into developIvan Alejandro
2013-06-14Make both clicks behave the same in the systrayTomás Touceda
2013-06-14Improve error messages in loginTomás Touceda
2013-06-14Fix wrong set_status call after refactorTomás Touceda
2013-06-14Fix set_eip_status wrong callTomás Touceda
2013-06-14Merge remote-tracking branch 'chiiph/bug/fix_get_domains' into developkali
2013-06-14Merge remote-tracking branch 'chiiph/bug/dont_start_if_stopped' into developkali
2013-06-13Always use best provider configTomás Touceda
Also, set the expected user@provider after stopping EIP, in case it was automatically started with another provider
2013-06-14Merge remote-tracking branch 'chiiph/feature/refactor_status' into developkali
2013-06-13Refactor the status bits out of the MainWindow to StatusPanelWidgetTomás Touceda
2013-06-13Don't autostart EIP if the user explicitly stops the serviceTomás Touceda
2013-06-14Merge remote-tracking branch 'chiiph/bug/mark_already_started_false' into ↵kali
develop
2013-06-14Merge remote-tracking branch 'chiiph/feature/display_provider_in_tray' into ↵kali
develop
2013-06-14Merge remote-tracking branch 'chiiph/bug/change_mainwindow_wording' into developkali
2013-06-13Merge branch 'always_show_context_menu_rev1' into developkali
Closes #2788
2013-06-13Always show context menu when clicking the systrayTomás Touceda
2013-06-13pep8kali
2013-06-13Refactor login to its own widget and remove Utils menuTomás Touceda
2013-06-13Merge remote-tracking branch 'kali/feature/osx-eip-scripts_rev1' into developTomás Touceda
Conflicts: src/leap/gui/mainwindow.py
2013-06-13If eip fails to autostart, mark it as suchTomás Touceda
2013-06-13pep8kali
2013-06-13changes filekali
2013-06-13add updown scriptsKali Kaneko
2013-06-13copy missing updown scripts if missingKali Kaneko
2013-06-12Display the default provider in the systray menuTomás Touceda
2013-06-12Fix wording in mainwindowTomás Touceda
2013-06-13Merge remote-tracking branch 'chiiph/feature/autostart_eip_rev1' into developkali
2013-06-13workaround for pyside multiple inheritance problemKali Kaneko
2013-06-12Fix SRPAuth error reportingTomás Touceda
2013-06-12Autostart EIP whenever possibleTomás Touceda
2013-06-11Merge remote-tracking branch ↵Tomás Touceda
'ivan/feature/2795_logout-should-not-disconnect-vpn' into develop
2013-06-11Remove lines disconnecting vpn on logoutIvan Alejandro
2013-06-11Merge remote-tracking branch 'kali/bug/openvpn-process_rev4' into developTomás Touceda
2013-06-12updated apikali
2013-06-12use twisted processProtocol instead of QProcess to drive openvpnkali
2013-06-11Merge remote-tracking branch 'ivan/bug/2755_remember-provider' into developTomás Touceda
2013-06-11Merge remote-tracking branch ↵Tomás Touceda
'ivan/feature/2774_check-provider-api-version_rev1' into develop
2013-06-12Merge remote-tracking branch 'chiiph/feature/merge_systray' into developkali
Conflicts: src/leap/gui/mainwindow.py
2013-06-12Merge remote-tracking branch 'chiiph/feature/selected_provider_config' into ↵kali
develop
2013-06-11Save the provider used for EIP as the default provider.Tomás Touceda