Age | Commit message (Collapse) | Author |
|
|
|
Closes #2848
|
|
|
|
|
|
into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Also, set the expected user@provider after stopping EIP, in case it
was automatically started with another provider
|
|
|
|
|
|
|
|
develop
|
|
develop
|
|
|
|
Closes #2788
|
|
|
|
|
|
|
|
Conflicts:
src/leap/gui/mainwindow.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'ivan/feature/2795_logout-should-not-disconnect-vpn' into develop
|
|
|
|
|
|
|
|
|
|
|
|
'ivan/feature/2774_check-provider-api-version_rev1' into develop
|
|
Conflicts:
src/leap/gui/mainwindow.py
|
|
develop
|
|
|
|
Also, catch a possible problem with the login answer from the
webapp and display a proper message
|
|
|