| Age | Commit message (Collapse) | Author |
|---|
|
'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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
includes refactor of common code for download of certificates
and config files.
|
|
into develop
|
|
|
|
into develop
|
|
|
|
develop
|
|
|
|
|
|
|
|
|
|
Also remove preferences button disable, we don't need that.
|
|
|
|
'ivan-github/feature/improve-git-release-workflow' into develop
|
|
|
|
This allows us to have master and develop in sync after the release.
Also get a correct and clean version report.
I've included the `-m` switch in the `git tag` command so we avoid to
open an editor and let us closer to make a script to automate this.
|
|
|
|
|
|
|
|
into develop
|
|
|
|
With this change we are following more accurately:
http://nvie.com/posts/a-successful-git-branching-model/
Also, we achieve a clean version in master.
If we do the tag before the merge in master, then we would have an extra
commit after the tagging, which causes version to be X.Y.Z-1-blah.
|
|
|
|
|
|
|
|
|
