Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2505 from bantu/ticket/12582-ascraeus | Joas Schilling | 2014-05-28 | 3 | -0/+29 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12582] Strip away copyrighted ICC profile from images * bantu/ticket/12582-ascraeus: [ticket/12582] Use the correct script name. [ticket/12582] Fix coding style. [ticket/12582] Remove set -e due to exiftool not liking 0 byte files. [ticket/12582] Strip away copyrighted ICC profile [ticket/12582] Change strip_icc_profiles.sh to only take a single file. [ticket/12582] Run strip_icc_profiles.sh on Travis CI. [ticket/12582] Overwrite inplace instead of creating _original files. [ticket/12582] Add script for strippping ICC profiles from images. | ||||
| * | Merge branch 'ticket/12582' into ticket/12582-ascraeus | Andreas Fischer | 2014-05-27 | 3 | -0/+29 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/12582: [ticket/12582] Strip away copyrighted ICC profile [ticket/12582] Change strip_icc_profiles.sh to only take a single file. [ticket/12582] Run strip_icc_profiles.sh on Travis CI. [ticket/12582] Overwrite inplace instead of creating _original files. [ticket/12582] Add script for strippping ICC profiles from images. Conflicts: .travis.yml | ||||
* | \ | Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 | Yuriy Rusko | 2014-05-27 | 1 | -4/+0 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: phpBB/docs/hook_system.html | ||||
| * | | [ticket/12592] Make hhvm run MySQL again. | Andreas Fischer | 2014-05-26 | 1 | -4/+0 |
| | | | | | | | | | | | | PHPBB3-12592 | ||||
* | | | [ticket/12594] Remove @package tags and update file headers | Yuriy Rusko | 2014-05-27 | 6 | -12/+42 |
|/ / | | | | | | | PHPBB3-12594 | ||||
* | | [ticket/12592] Add PHP 5.4 environment using mysql driver. | Andreas Fischer | 2014-05-26 | 2 | -1/+43 |
| | | | | | | | | PHPBB3-12592 | ||||
* | | [ticket/12592] Rename mysql environment to mysqli. | Andreas Fischer | 2014-05-26 | 3 | -3/+3 |
| | | | | | | | | PHPBB3-12592 | ||||
* | | [ticket/12470] Correctly set up the php extensions | Joas Schilling | 2014-05-03 | 1 | -2/+2 |
| | | | | | | | | PHPBB3-12470 | ||||
* | | [ticket/12470] Fix setup of phpbb | Joas Schilling | 2014-05-03 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-12470 | ||||
* | | [ticket/12470] Move setup of phpBB to new .sh | Joas Schilling | 2014-05-03 | 1 | -0/+29 |
| | | | | | | | | PHPBB3-12470 | ||||
* | | [ticket/12470] Move setup of database to new .sh | Joas Schilling | 2014-05-03 | 1 | -0/+26 |
| | | | | | | | | PHPBB3-12470 | ||||
* | | [ticket/12470] Move phing sniff into new .sh | Joas Schilling | 2014-05-03 | 1 | -0/+17 |
| | | | | | | | | PHPBB3-12470 | ||||
* | | Merge branch 'develop-olympus' into develop-ascraeus | Joas Schilling | 2014-05-03 | 4 | -13/+13 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12485] Broken tests due to absolute exclude Conflicts: .travis.yml phpunit.xml.all phpunit.xml.dist phpunit.xml.functional | ||||
| * | [ticket/12485] Broken tests due to absolute exclude | Nicofuma | 2014-05-03 | 4 | -10/+54 |
| | | | | | | | | PHPBB3-12485 | ||||
* | | [feature/sqlite3] Remove invalid comment | Joas Schilling | 2014-05-02 | 2 | -4/+0 |
| | | | | | | | | PHPBB3-9728 | ||||
* | | [feature/sqlite3] Add support for SQLite 3 | Patrick Webster | 2014-05-02 | 1 | -0/+44 |
| | | | | | | | | | | | | | | Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0 when support for SQLite 3 was added. PHPBB3-9728 | ||||
* | | Merge branch 'develop-olympus' into develop-ascraeus | Joas Schilling | 2014-04-10 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | * develop-olympus: [ticket/12320] Install a nightly build of HHVM. [ticket/12320] No longer allow Travis CI HHVM environment to fail. | ||||
| * | [ticket/12320] Install a nightly build of HHVM. | Andreas Fischer | 2014-04-10 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-12320 | ||||
* | | Merge branch 'develop-olympus' into develop-ascraeus | Joas Schilling | 2014-04-03 | 1 | -2/+1 |
|\ \ | |/ | | | | | | | * develop-olympus: [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise." | ||||
| * | [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise." | Andreas Fischer | 2014-04-03 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | This reverts commit f6614f2078740675ca0228b348500991888c2140 as the install command started failing with "Version '3.0.0~precise' for 'hhvm' was not found" in the meantime. PHPBB3-12318 | ||||
* | | Merge branch 'develop-olympus' into develop-ascraeus | Joas Schilling | 2014-03-31 | 1 | -29/+54 |
|\ \ | |/ | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12318] Use MySQL instead of MySQLi for now on HHVM. [ticket/12318] Pin HHVM version to 3.0.0~precise. [ticket/12318] Always install new config file on HHVM upgrade conflict. [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04. [ticket/12318] Upgrade to a recent stable version of HHVM. [ticket/12318] Correctly setup HHVM for functional tests. | ||||
| * | [ticket/12318] Use MySQL instead of MySQLi for now on HHVM. | Andreas Fischer | 2014-03-30 | 1 | -0/+4 |
| | | | | | | | | PHPBB3-12318 | ||||
| * | [ticket/12318] Pin HHVM version to 3.0.0~precise. | Andreas Fischer | 2014-03-30 | 1 | -1/+2 |
| | | | | | | | | PHPBB3-12318 | ||||
| * | [ticket/12318] Always install new config file on HHVM upgrade conflict. | Andreas Fischer | 2014-03-30 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-12318 | ||||
| * | [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04. | Andreas Fischer | 2014-03-30 | 1 | -0/+6 |
| | | | | | | | | PHPBB3-12318 | ||||
| * | [ticket/12318] Upgrade to a recent stable version of HHVM. | Andreas Fischer | 2014-03-30 | 1 | -0/+3 |
| | | | | | | | | PHPBB3-12318 | ||||
| * | [ticket/12318] Correctly setup HHVM for functional tests. | Andreas Fischer | 2014-03-30 | 1 | -29/+40 |
| | | | | | | | | PHPBB3-12318 | ||||
* | | [ticket/12281] Disable redis on travis until its fixed again | Joas Schilling | 2014-03-16 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | /home/travis/build/phpbb/phpbb/redis/redis.c:6141:34: error: unknown type name ‘tsrm_ls’ make: *** [redis.lo] Error 1 The command "sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/setup-php-extensions.sh; fi"" failed and exited with 2 during install. PHPBB3-12281 | ||||
* | | [ticket/12141] Disable opcache on travis for php 5.5.8 aswell | Joas Schilling | 2014-02-08 | 1 | -2/+2 |
| | | | | | | | | PHPBB3-12141 | ||||
* | | [ticket/12141] Disable broken opcache extension on PHP 5.5.7. | Andreas Fischer | 2014-02-04 | 1 | -0/+6 |
| | | | | | | | | PHPBB3-12141 | ||||
* | | [ticket/11985] Rename install -> setup. This is more generic and consistent. | Andreas Fischer | 2014-02-04 | 1 | -0/+0 |
| | | | | | | | | PHPBB3-11985 | ||||
* | | [ticket/11985] Don't try to install APC on PHP 5.5 or higher. | Andreas Fischer | 2014-02-03 | 1 | -3/+6 |
| | | | | | | | | PHPBB3-11985 | ||||
* | | [ticket/11985] Enable APC on command line so it can be used by PHPUnit. | Andreas Fischer | 2014-02-03 | 1 | -1/+13 |
| | | | | | | | | PHPBB3-11985 | ||||
* | | [ticket/11985] Reorganise travis/install-php-extensions.sh | Andreas Fischer | 2014-02-03 | 1 | -10/+24 |
| | | | | | | | | PHPBB3-11985 | ||||
* | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2013-10-26 | 2 | -7/+9 |
|\ \ | |/ | | | | | | | | | * develop-olympus: [ticket/11970] Make apt-get less quiet. [ticket/11970] Add set -x to Travis setup scripts. | ||||
| * | [ticket/11970] Make apt-get less quiet. | Andreas Fischer | 2013-10-26 | 2 | -7/+7 |
| | | | | | | | | PHPBB3-11970 | ||||
| * | [ticket/11970] Add set -x to Travis setup scripts. | Andreas Fischer | 2013-10-26 | 2 | -0/+2 |
| | | | | | | | | | | | | Output is hidden by Travis by default and this will allow easier debugging. PHPBB3-11970 | ||||
* | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-10-25 | 1 | -1/+11 |
|\ \ | |/ | | | | | | | * develop-olympus: [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL. | ||||
| * | [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL. | Andreas Fischer | 2013-10-25 | 1 | -1/+11 |
| | | | | | | | | PHPBB3-11920 | ||||
* | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-10-16 | 1 | -0/+5 |
|\ \ | |/ | | | | | | | | | | | * develop-olympus: [ticket/11920] Print MariaDB version after successful setup. [ticket/11920] Manually purge mysql-common. [ticket/11920] Actually call travis/setup-mariadb.sh. | ||||
| * | [ticket/11920] Print MariaDB version after successful setup. | Andreas Fischer | 2013-10-16 | 1 | -0/+2 |
| | | | | | | | | PHPBB3-11920 | ||||
| * | [ticket/11920] Manually purge mysql-common. | Andreas Fischer | 2013-10-16 | 1 | -0/+3 |
| | | | | | | | | PHPBB3-11920 | ||||
* | | Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop | Nils Adermann | 2013-10-15 | 2 | -0/+74 |
|\ \ | |/ | | | | | | | | | | | | | | | * github-phpbb/develop-olympus: [ticket/11920] Have to use empty root password otherwise db creation fails. [ticket/11920] Add MariaDB environment to Travis-CI. Conflicts: .travis.yml | ||||
| * | [ticket/11920] Have to use empty root password otherwise db creation fails. | Andreas Fischer | 2013-10-15 | 2 | -1/+8 |
| | | | | | | | | PHPBB3-11920 | ||||
| * | [ticket/11920] Add MariaDB environment to Travis-CI. | Andreas Fischer | 2013-10-15 | 2 | -0/+67 |
| | | | | | | | | PHPBB3-11920 | ||||
* | | [ticket/11700] travis has hardcoded driver class names without namespaces | Nils Adermann | 2013-09-16 | 2 | -2/+2 |
| | | | | | | | | PHPBB3-11700 | ||||
* | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-09-02 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * develop-olympus: [ticket/11823] Set up nginx server to match PHP files with characters after .php | ||||
| * | [ticket/11823] Set up nginx server to match PHP files with characters after .php | David King | 2013-09-02 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-11823 | ||||
* | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-07-23 | 1 | -3/+0 |
|\ \ | |/ | | | | | | | * develop-olympus: [ticket/11726] Don't run lint tests on Travis on postgres | ||||
| * | [ticket/11726] Don't run lint tests on Travis on postgres | Nathan Guse | 2013-07-22 | 1 | -3/+0 |
| | | | | | | | | PHPBB3-11726 |