aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/composer.json
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-131-1/+1
|\
| * [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-061-1/+1
* | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-061-6/+6
|\ \
| * | [ticket/11818] Update Symfony dependencies to 2.3.*Nathan Guse2013-09-021-6/+6
* | | [feature/oauth] Update lusitanian/oauth to stable branchJoseph Warner2013-09-021-1/+1
* | | [feature/oauth] Include OAuth library in composer.jsonJoseph Warner2013-07-141-0/+1
|/ /
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-131-1/+2
|\ \ | |/
| * [ticket/11671] Add phing as a dependency and upgrade depsNils Adermann2013-07-121-1/+2
* | [feature/twig] Change composer to load Twig 1.13.*Nathan Guse2013-06-241-1/+1
* | [feature/twig] Adding Twig dependency to composer.jsonNathan Guse2013-06-091-1/+2
* | Merge branch 'develop-olympus' into developNils Adermann2013-05-091-1/+3
|\ \ | |/
| * [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
| * [ticket/11526] Increase composer minimum stability in olympus to stable.Andreas Fischer2013-05-091-1/+0
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-031-1/+1
|\ \ | |/
| * [ticket/11238] Set goutte version to 0.1.0.Oleg Pudeyev2012-12-021-1/+1
* | [feature/controller] Implement a front controllerDavid King2012-11-161-0/+1
* | [feature/compiled-dic] Add HttpKernel; the Extension class is loaded from itDavid King2012-11-101-0/+1
* | [feature/dic] Remove duplicate event-dispatcher dependencyIgor Wiedler2012-07-291-1/+0
* | [feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock fileIgor Wiedler2012-07-261-7/+7
* | Merge branch 'develop' into feature/dicIgor Wiedler2012-07-211-1/+6
|\ \
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2012-07-191-3/+7
| |\ \ | | |/
| | * [ticket/10981] Added goutte via composerFyorl2012-07-161-0/+6
* | [feature/dic] Convert common.php to Symfony2 DependencyInjection componentIgor Wiedler2012-03-311-1/+4
|/
* [feature/event-dispatcher] Use real EventDispatcher through composerIgor Wiedler2012-03-111-0/+5