aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/composer.json
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-12-031-1/+1
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/11238] Set goutte version to 0.1.0. Conflicts: phpBB/composer.lock
| * [ticket/11238] Set goutte version to 0.1.0.Oleg Pudeyev2012-12-021-1/+1
| | | | | | | | PHPBB3-11238
* | [feature/controller] Implement a front controllerDavid King2012-11-161-0/+1
| | | | | | | | PHPBB3-10864
* | [feature/compiled-dic] Add HttpKernel; the Extension class is loaded from itDavid King2012-11-101-0/+1
| | | | | | | | | | | | | | | | | | The phpbb_di_extension_* classes extend the Extension class that is included in the HttpKernel component. If I don't include HttpKernel I have to implement the ExtensionInterface from the DependencyInjection component and have to define all of the methods; this way, I can just overwrite what I need. PHPBB3-10864
* | [feature/dic] Remove duplicate event-dispatcher dependencyIgor Wiedler2012-07-291-1/+0
| | | | | | | | PHPBB3-10739
* | [feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock fileIgor Wiedler2012-07-261-7/+7
| | | | | | | | PHPBB3-10739
* | Merge branch 'develop' into feature/dicIgor Wiedler2012-07-211-1/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (441 commits) [feature/new-tz-handling] Don't use global user but make it a parameter [feature/new-tz-handling] Fix size of suggestion button in chrome [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid [feature/new-tz-handling] Add previous selected value to validation if valid [feature/new-tz-handling] Display suggestion when a different value is selected [ticket/10998] Add border-radius to forum rules block - prosilver [feature/new-tz-handling] Remove additional marking of selected items [feature/new-tz-handling] Move update helper function to new class [feature/new-tz-handling] Fix unit test [feature/new-tz-handling] Delete old variable which is not used anymore [feature/new-tz-handling] Rename $user->tz back to $user->timezone [feature/pagination-as-list] New parameter for name of start var [feature/pagination-as-list] Updates for nils comments [feature/pagination-as-list] Rename and deprecate functions [feature/pagination-as-list] Various fixes and improvements [ticket/10968] Render pagination within the template [feature/new-tz-handling] Remove "timezone might be numeric" [feature/new-tz-handling] Add function to update the timezone [feature/new-tz-handling] Correctly update user and board timezones on update [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL ... Conflicts: phpBB/common.php phpBB/composer.json phpBB/composer.lock tests/cron/task_provider_test.php
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2012-07-191-3/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10981] Added check for PHP version before running composer [ticket/10981] Modified travis to use composer with --dev [ticket/10981] Removed setupBeforeClass [ticket/10981] Modified functional framework to account for goutte changes [ticket/10981] Added goutte via composer Conflicts: .travis.yml composer.phar phpBB/composer.json phpBB/composer.lock tests/bootstrap.php
| | * [ticket/10981] Added goutte via composerFyorl2012-07-161-0/+6
| | | | | | | | | | | | composer.phar added and autoloaded before tests PHPBB3-10981
* | [feature/dic] Convert common.php to Symfony2 DependencyInjection componentIgor Wiedler2012-03-311-1/+4
|/ | | | PHPBB3-10739
* [feature/event-dispatcher] Use real EventDispatcher through composerIgor Wiedler2012-03-111-0/+5
* replace the copy-pasta EventDispatcher with the real one from Symfony2 * use composer for managing this dependency, use composer autoloading PHPBB3-9550