aboutsummaryrefslogtreecommitdiffstats
path: root/build
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-09-271-2/+2
|\
| * [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.Andreas Fischer2013-09-271-3/+3
| * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-271-2/+2
| |\
| | * [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-271-2/+2
| * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-051-2/+2
| |\ \ | | |/
| | * [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-021-2/+2
| * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-011-2/+2
| |\ \ | | |/
| | * [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-011-2/+2
* | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-141-2/+2
|\ \ \
| * \ \ Merge remote-tracking branch 'github-phpbb/develop-olympus' into developNils Adermann2013-07-141-2/+2
| |\ \ \ | | |/ /
| | * | [ticket/11704] Use the correct directory for dependency checking.Andreas Fischer2013-07-141-1/+1
| | * | [ticket/11704] Correctly escape "Andreas Fischer2013-07-141-1/+1
| | |/
* | | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-141-13/+29
|\ \ \ | |/ /
| * | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-13/+29
| |\ \ | | |/
| | * [ticket/11674] Do not include vendor folder if there are no dependencies.Andreas Fischer2013-07-131-13/+29
| | * [develop-olympus] Bump version numbers for 3.0.12-RC1 release.Andreas Fischer2013-07-121-1/+1
* | | [ticket/11574] Include vendor into update packagesJoas Schilling2013-07-131-0/+2
|/ /
* | Merge branch 'develop-olympus' into developNils Adermann2013-05-091-2/+4
|\ \ | |/
| * [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.Andreas Fischer2013-05-091-2/+4
* | Merge PR #1162 branch 'develop-olympus' into developOleg Pudeyev2012-12-291-9/+33
|\ \ | |/
| * Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympusOleg Pudeyev2012-12-291-9/+33
| |\
| | * [ticket/11291] phing: Also add checkreturn="true" to composer execution.Andreas Fischer2012-12-291-0/+1
| | * [ticket/11291] phing: Add checkreturn="true" to all new commands.Andreas Fischer2012-12-291-1/+4
| | * [ticket/11291] phing: Exclude vendor folder from diffs.Andreas Fischer2012-12-291-0/+1
| | * [ticket/11291] phing packaging: Export composer.phar and install dependencies.Andreas Fischer2012-12-291-4/+10
| | * [ticket/11291] phing: Remove no longer needed create-package target.Andreas Fischer2012-12-291-3/+2
| | * [ticket/11291] phing: The package target does not depend on composer.Andreas Fischer2012-12-291-1/+1
| | * [ticket/11291] phing: Adjust directory format of composer exec.Andreas Fischer2012-12-291-1/+1
| | * [ticket/11291] phing: Add description for composer target.Andreas Fischer2012-12-291-0/+5
| | * [ticket/11291] phing: Add --dev to composer install.Andreas Fischer2012-12-291-1/+1
| | * [ticket/11291] phing: Correct dependencies of composer target.Andreas Fischer2012-12-291-1/+1
| | * [ticket/11291] phing: Make sure composer is available before calling it.Andreas Fischer2012-12-231-3/+12
* | | [develop] Set build version (and thus package name) to 3.1.0-dev.Andreas Fischer2012-12-231-1/+1
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-231-3/+3
|\ \ \ | |/ /
| * | [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.Andreas Fischer2012-12-231-3/+3
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-08-201-2/+2
|\ \ | |/
| * Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-08-201-2/+2
| |\
| | * [prep-release-3.0.11] Bumping version number for 3.0.11 final.Andreas Fischer2012-08-201-2/+2
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-2/+2
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-231-2/+2
| |\ \ | | |/
| | * [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.Andreas Fischer2012-07-231-2/+2
| * | [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.Andreas Fischer2012-07-211-5/+16
| |/
* | [ticket/10932] Use included composer.phar in build processNils Adermann2012-06-111-14/+2
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-311-3/+3
|\ \ | |/
| * [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-311-3/+3
* | [ticket/10736] Run composer in phing buildsNils Adermann2012-03-311-5/+28
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-025-10/+6
|\ \ | |/
| * Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-...Andreas Fischer2012-01-025-10/+6
| |\
| | * [ticket/9916] Changing header in non-distributed filesUnknown2012-01-025-10/+6
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-011-2/+2
|\ \ \ | |/ /