Age | Commit message (Collapse) | Author |
|
|
|
Closes: #3554
|
|
|
|
'ivan-github/feature/3616_remove-last-page-from-wizard' into develop
|
|
Also remove the globe image because is no longer needed.
|
|
|
|
|
|
'ivan-github/bug/3657_display-correct-service-name-in-wizard' into develop
|
|
'ivan-github/bug/3595_gateway-selection-problem' into develop
|
|
|
|
Python returns the timezone with the opposed sign to the standard
notation.
|
|
Closes: #3504
|
|
|
|
'ivan/feature/3668_complete-use-of-configured-gateway' into develop
|
|
Also use python 2.6 compatible str.format.
|
|
|
|
|
|
|
|
|
|
|
|
Closes: #3658
|
|
|
|
|
|
|
|
'ivan/feature/3505_preferences-select-gateway-manually' into develop
|
|
|
|
|
|
|
|
|
|
|
|
Also the test code in the bottom was updated to work.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
develop
|
|
...And this should be fixed forever and ever now.
or until we change namespaces/package names again :)
|
|
develop
|
|
Closes #3610.
|
|
|
|
|
|
|
|
|
|
|
|
into develop
Conflicts:
src/leap/bitmask/config/leapsettings.py
|
|
|
|
|
|
develop
Conflicts:
src/leap/bitmask/gui/mainwindow.py
src/leap/bitmask/gui/preferenceswindow.py
|