aboutsummaryrefslogtreecommitdiffstats
path: root/build
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-04-031-5/+5
|\
| * Merge branch '3.0.x' into 3.1.xJoas Schilling2015-04-031-5/+5
| |\
| | * [ticket/13738] Use new branch names in sami-all.conf.php.Andreas Fischer2015-04-021-5/+5
| | * Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-301-2/+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 developAndreas Fischer2015-01-171-7/+7
|\ \ \ | |/ /
| * | [ticket/13511] Call the check() method with the phpcsFile objectTristan Darricau2015-01-171-7/+7
* | | Merge branch 'develop-ascraeus' into developDhruv2015-01-111-0/+1
|\ \ \ | |/ /
| * | [ticket/13272] Add vendor/ folder to "changed files" packageJoas Schilling2015-01-101-0/+1
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-49/+69
|\ \ \ | |/ /
| * | [ticket/13402] Handle arrays and multiples typesTristan Darricau2014-11-301-2/+10
| * | [ticket/13402] Refactor unused use SniffTristan Darricau2014-11-301-79/+29
| * | [ticket/13402] Code sniffer, unused use, check the function doc blocksTristan Darricau2014-11-291-0/+62
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-281-3/+3
|\ \ \ | |/ /
| * | [ticket/13381] Allow ' *' in the doc blocks (especially the header files)Tristan Darricau2014-11-271-3/+3
* | | 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-123-16/+38
|\ \ \ | |/ /
| * | Merge pull request #3142 from bantu/ticket/13331Andreas Fischer2014-11-123-16/+38
| |\ \ | | |/
| | * [ticket/13331] Use docs target for this branch, add docs-all for dev branches.Andreas Fischer2014-11-123-20/+51
* | | 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
| |/ /
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-10-251-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3059 from nickvergessen/ticket/13208Marc Alexander2014-10-231-1/+1
| |\ \