| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
PHPBB3-16223
|
| |
|
|
| |
PHPBB3-14948
|
| |
|
|
|
|
|
| |
This seems to cause issues with the UI tests as the backed up
static web driver does not seem to be properly initialized.
PHPBB3-14670
|
| |
|
|
| |
PHPBB3-12962
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/12485] Broken tests due to absolute exclude
Conflicts:
.travis.yml
phpunit.xml.all
phpunit.xml.dist
phpunit.xml.functional
|
| | |
| |
| |
| | |
PHPBB3-12485
|
| | |
| |
| |
| | |
PHPBB3-9728
|
| | |
| |
| |
| | |
PHPBB3-11700
|
| |\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/11726] Don't run lint tests on Travis on postgres
|
| | |
| |
| |
| | |
PHPBB3-11726
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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-11668
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11337] Abort setup-webserver.sh script when an error occurs.
[ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
[ticket/11337] Silence nginx config file writing.
[ticket/11337] php-fpm.conf is no longer owned by root.
[ticket/11337] Run functional tests on travis using nginx and php-fpm.
Conflicts:
.travis.yml
|
| | |
| |
| |
| |
| |
| |
| | |
There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19,
which is what 5.3 is currently aliased to.
PHPBB3-11337
|
| | |
| |
| |
| | |
PHPBB3-11337
|
| | |
| |
| |
| | |
PHPBB3-11338
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/develop: (196 commits)
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
[ticket/11247] Fix wrong property reference in flock class.
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
[ticket/10716] Collect standard error from executed php process.
[ticket/10716] Skip test if php is not in PATH.
[ticket/10716] Exclude our dependencies from linting.
[ticket/10103] New and improved wording.
[ticket/10716] Only lint on php 5.3+.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
[ticket/10103] Inline assignment is bad?
[ticket/10103] $rv had too few characters.
[ticket/10103] Correct flock class documentation.
...
Conflicts:
phpBB/includes/functions.php
tests/cache/cache_test.php
|
| | |
| |
| |
| | |
PHPBB3-11240
|
| |/
|
|
| |
PHPBB3-11015
|
| |
|
|
| |
PHPBB3-10492
|
| |
|
|
|
|
| |
Correct information so all tests don't run on sqlite
PHPBB3-10723
|
| |
|
|
| |
PHPBB3-10718
|
|
|
PHPBB3-10718
|
