aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/composer.lock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/12429' into ticket/12429-developAndreas Fischer2014-05-021-87/+372
|\ | | | | | | | | | | | | | | | | * ticket/12429: [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3. Conflicts: phpBB/composer.json phpBB/composer.lock
| * [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.Andreas Fischer2014-05-021-78/+374
| | | | | | | | PHPBB3-12429
* | [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12.Andreas Fischer2014-04-201-35/+35
| | | | | | | | PHPBB3-12424
* | [ticket/12423] Move PHP CodeSniffer from non-stable 1.5.0RC4 to latest 1.5.2.Andreas Fischer2014-04-201-30/+62
| | | | | | | | PHPBB3-12423
* | [ticket/11998] Add symfony/console as dependency.Andreas Fischer2013-11-031-1/+54
| | | | | | | | PHPBB3-11998
* | [task/code-sniffer] Add PHP CodeSniffer dependency to composer.Andreas Fischer2013-10-271-2/+72
| | | | | | | | PHPBB3-11980
* | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-131-139/+278
|\ \ | |/ | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11831] getAttribute was replaced with attr [ticket/11831] Update fabpot/goutte to 1.0.* Conflicts: phpBB/composer.lock
| * [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-061-153/+297
| | | | | | | | PHPBB3-11831
* | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-061-122/+318
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| * | [ticket/11818] Update Symfony dependencies to 2.3.*Nathan Guse2013-09-021-154/+343
| | | | | | | | | | | | PHPBB3-11818
* | | [feature/oauth] Update lusitanian/oauth to stable branchJoseph Warner2013-09-021-16/+26
| | | | | | | | | | | | PHPBB3-11673
* | | [feature/oauth] Include OAuth library in composer.jsonJoseph Warner2013-07-141-12/+58
|/ / | | | | | | PHPBB3-11673
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-131-1/+53
|\ \ | |/ | | | | | | | | | | | | | | | | | | # By Igor Wiedler (1) and others * develop-olympus: [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps [ticket/11668] Move lint test to the end for travis Conflicts: phpBB/composer.lock
| * [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-0/+4
| | | | | | | | PHPBB3-11671
| * [ticket/11671] Add phing as a dependency and upgrade depsNils Adermann2013-07-121-57/+113
| | | | | | | | PHPBB3-11671
* | [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-15/+28
| | | | | | | | PHPBB3-11671
* | [feature/twig] Change composer to load Twig 1.13.*Nathan Guse2013-06-241-1/+1
| | | | | | | | PHPBB3-11598
* | [feature/twig] Update composer.lockNathan Guse2013-06-111-33/+819
| | | | | | | | PHPBB3-11598
* | [feature/twig] Adding Twig dependency to composer.jsonNathan Guse2013-06-091-820/+78
| | | | | | | | PHPBB3-11598
* | Merge branch 'develop-olympus' into developNils Adermann2013-05-091-1/+413
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR. [ticket/11513] Update all CLI calls to phpunit to use vendor/bin. [ticket/11513] Use PHPUnit from composer in .travis.yml. [ticket/11513] Update (all) composer dependencies. [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency. Conflicts: .travis.yml phpBB/composer.lock
| * [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| | | | | | | | PHPBB3-11513
* | Merge branch 'develop-olympus' into developNils Adermann2013-05-091-189/+144
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11526] Update all dependencies / regenerate composer.lock. [ticket/11526] Increase composer minimum stability in olympus to stable. [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7. Conflicts: phpBB/composer.json phpBB/composer.lock
| * [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| | | | | | | | PHPBB3-11526
| * [ticket/11238] Set goutte version to 0.1.0.Oleg Pudeyev2012-12-021-31/+432
| | | | | | | | PHPBB3-11238
* | [ticket/11238] Set goutte to 0.1.0 in develop.Oleg Pudeyev2012-12-021-103/+67
| | | | | | | | PHPBB3-11238
* | [feature/controller] Implement a front controllerDavid King2012-11-161-2/+60
| | | | | | | | PHPBB3-10864
* | [feature/compiled-dic] Update the composer.lock fileDavid King2012-11-101-60/+60
| | | | | | | | PHPBB3-11152
* | [feature/compiled-dic] Fix cron task loadingDavid King2012-11-101-34/+716
| | | | | | | | | | | | | | | | We cannot use container tags at run time if we are using a cached, compiled container object (i.e. phpbb_cache_container) so we have to load them beforehand. PHPBB3-11152
* | [feature/dic] Update composer.lock to symfony/* RC1Igor Wiedler2012-08-251-15/+15
| | | | | | | | PHPBB3-10739
* | [feature/dic] Require symfony/* 2.1.*, tabs instead of spaces, --dev lock fileIgor Wiedler2012-07-261-6/+51
| | | | | | | | PHPBB3-10739
* | Merge branch 'develop' into feature/dicIgor Wiedler2012-07-211-6/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/+47
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/+55
| | | | | | | | | | | | composer.phar added and autoloaded before tests PHPBB3-10981
* | [feature/dic] Convert common.php to Symfony2 DependencyInjection componentIgor Wiedler2012-03-311-2/+14
|/ | | | PHPBB3-10739
* [feature/event-dispatcher] Use real EventDispatcher through composerIgor Wiedler2012-03-111-0/+10
* replace the copy-pasta EventDispatcher with the real one from Symfony2 * use composer for managing this dependency, use composer autoloading PHPBB3-9550