aboutsummaryrefslogtreecommitdiffstats
path: root/build/build.xml
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-05-031-2/+2
|\
| * Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-031-2/+2
| |\
| | * [prep-release-3.1.4] Update version to 3.1.4Joas Schilling2015-05-031-2/+2
* | | Merge branch '3.1.x'Andreas Fischer2015-05-031-1/+1
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-031-1/+1
| |\ \ | | |/
| | * Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-1/+1
| | |\
| | | * [prep-release-3.0.14] Bump version numbers for 3.0.14 release.Andreas Fischer2015-05-031-3/+3
| | * | [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-291-2/+2
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-281-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-281-1/+1
| | |\ \ | | | |/
| | | * [3.0.x] Bump version numbers for 3.0.14-RC1 release.Andreas Fischer2015-04-271-1/+1
| | | * Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-301-2/+2
| | | |\
| * | | | [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-101-1/+1
| |/ / /
| * | | Update version to 3.1.4-RC1Joas Schilling2015-04-091-1/+1
* | | | [ticket/13767] Remove vendor/s9e/text-formatter/.git during buildJoshyPHP2015-04-191-0/+2
* | | | [ticket/13619] Remove unneeded files and folders from vendor in release packageMarc Alexander2015-02-151-0/+32
* | | | [ticket/13407] Update Symfony to 2.7.*@devNicofuma2015-02-041-0/+12
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-011-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-02-011-1/+1
| |\ \ \
| | * | | [prep-release-3.1.3] Update version to 3.1.3Joas Schilling2015-02-011-3/+3
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-311-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-311-3/+3
| |\ \ \ \ | | |/ / /
| | * | | [prep-release-3.1.3] Update version to 3.1.3-RC2Joas Schilling2015-01-311-3/+3
| |/ / /
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-301-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-301-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.Andreas Fischer2015-01-291-2/+2
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-301-2/+2
|\ \ \ \ | |/ / /
| * | | [prep-release-3.1.3] Update version to 3.1.2-RC1Joas Schilling2015-01-261-1/+1
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2015-01-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-261-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'prep-release-3.0.13' into develop-olympusNils Adermann2015-01-261-1/+1
| | |\ \ | | | |/
| | | * [prep-release-3.0.13] Bump version numbers for 3.0.13 releaseNils Adermann2015-01-261-3/+3
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-211-1/+1
| |\ \ \ | | |/ /
| | * | [develop-olympus] Increment version number to 3.0.14-dev.Andreas Fischer2015-01-211-3/+3
| | |/
| | * [develop-olympus] Bump version numbers for 3.0.13-RC1 release.Andreas Fischer2015-01-211-1/+1
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-251-2/+2
|\ \ \ | |/ /
| * | [prep-release-3.1.2] Update the development version to 3.1.3-RC1-devJoas Schilling2014-11-251-3/+3
| * | [prep-release-3.1.2] Increase version number to 3.1.2Joas Schilling2014-11-241-3/+3
| * | [prep-release-3.1.2] Update version to 3.1.2-RC1Joas Schilling2014-11-221-1/+1
* | | [ticket/12620] Use the test environment for the testsTristan Darricau2014-11-201-0/+2
* | | [ticket/13063] Adds Twig routing extensionTristan Darricau2014-11-201-0/+6
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-121-1/+8
|\ \ \ | |/ /
| * | Merge pull request #3142 from bantu/ticket/13331Andreas Fischer2014-11-121-1/+8
| |\ \ | | |/
| | * [ticket/13331] Use docs target for this branch, add docs-all for dev branches.Andreas Fischer2014-11-121-1/+8
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-021-3/+2
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-021-3/+3
| |\ \
| | * | [prep-release-3.1.1] Update version number to 3.1.1Nils Adermann2014-11-011-3/+3
| * | | [develop-ascraeus] Update version number to 3.1.1-RC1-devNils Adermann2014-10-251-3/+3
| |/ /