| Age | Commit message (Collapse) | Author |
|---|
|
This is done in order to make them similar and them merge as much as
code as possible.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Following the docs here:
http://read-the-docs.readthedocs.org/en/latest/faq.html#i-get-import-errors-on-libraries-that-depend-on-c-modules
|
|
|
|
|
|
develop
|
|
'ivan-github/bug/3914_unhandled-error-on-version-flag' into develop
|
|
This code reorder avoids to get an error message if we run some code
when the only thing we want is to get the version.
Closes #3914.
|
|
|
|
|
|
|
|
|
|
|
|
Don't worry, I have put together a script to make this.
|
|
|
|
Conflicts:
pkg/requirements.pip
setup.py
src/leap/bitmask/config/leapsettings.py
|
|
release-0.3.3
|
|
|
|
|
|
|
|
|
|
|
|
This implements an abstract definition of a LEAP state machine,
and refactors eip connections to use it.
|
|
|
|
|
|
'ivan-github/feature/improve-build-bundle-script' into develop
|
|
into develop
|
|
|
|
'ivan-github/bug/3656_generic-username-password-message' into develop
|
|
into develop
|
|
|
|
Improve documentation of the script regarding its usage.
Support different tags in the needed repositories and use latest tag for
each one.
Refactor code to be more readable.
|
|
|
|
Actually there should still be a test if it fails!
|
|
|
|
|
|
'ivan-github/feature/3792_systray-texts-improvements' into develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
develop
|
