| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
* ticket/12429:
[ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
Conflicts:
phpBB/composer.json
phpBB/composer.lock
|
| |
| |
| |
| | |
PHPBB3-12429
|
| |
| |
| |
| | |
PHPBB3-12424
|
| |
| |
| |
| | |
PHPBB3-12423
|
| |
| |
| |
| | |
PHPBB3-11998
|
| |
| |
| |
| | |
PHPBB3-11980
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
* remotes/upstream/develop-olympus:
[ticket/11831] getAttribute was replaced with attr
[ticket/11831] Update fabpot/goutte to 1.0.*
Conflicts:
phpBB/composer.lock
|
| |
| |
| |
| | |
PHPBB3-11831
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
feature/oauth
Conflicts:
phpBB/composer.json
phpBB/composer.lock
phpBB/develop/create_schema_files.php
phpBB/includes/ucp/ucp_register.php
PHPBB3-11673
|
| | |
| | |
| | |
| | | |
PHPBB3-11818
|
| | |
| | |
| | |
| | | |
PHPBB3-11673
|
|/ /
| |
| |
| | |
PHPBB3-11673
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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
|
| |
| |
| |
| | |
PHPBB3-11671
|
| |
| |
| |
| | |
PHPBB3-11671
|
| |
| |
| |
| | |
PHPBB3-11671
|
| |
| |
| |
| | |
PHPBB3-11598
|
| |
| |
| |
| | |
PHPBB3-11598
|
| |
| |
| |
| | |
PHPBB3-11598
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| | |
PHPBB3-11513
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| | |
PHPBB3-11526
|
| |
| |
| |
| | |
PHPBB3-11238
|
| |
| |
| |
| | |
PHPBB3-11238
|
| |
| |
| |
| | |
PHPBB3-10864
|
| |
| |
| |
| | |
PHPBB3-11152
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
PHPBB3-10739
|
| |
| |
| |
| | |
PHPBB3-10739
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| |
| |
| |
| |
| |
| | |
composer.phar added and autoloaded before tests
PHPBB3-10981
|
|/
|
|
| |
PHPBB3-10739
|
|
* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading
PHPBB3-9550
|