mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 22:28:46 +01:00
Code Issues Releases Wiki Activity
22,474 Commits 17 Branches 190 Tags
Commit Graph

77 Commits

Author SHA1 Message Date
Tristan Darricau
a2af95cb37 [ticket/12825] Better sniff for the extensions and skip the vendor/ directory 
PHPBB3-12825
 2014-07-06 23:34:17 +02:00
Andreas Fischer
99e08bffd8 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12741] Change the mode of the socket file
 2014-06-19 19:32:22 +02:00
Tristan Darricau
f62ec14926 [ticket/12741] Change the mode of the socket file 
Since php 5.4.29, by default, php-fpm creates the socket with the 0600 mode
instead of 0666.

PHPBB3-12741
 2014-06-19 18:44:44 +02:00
Joas Schilling
3d347d47f2 [ticket/12483] Fix copyright in prepare_extension.sh 
PHPBB3-12483
 2014-06-10 19:41:38 +02:00
Joas Schilling
709296e54a [ticket/12483] Add a .sh that moves an extension in place 
PHPBB3-12483
 2014-06-10 19:41:34 +02:00
Joas Schilling
9f568959a9 [ticket/12594] Update file header in non-php files 
PHPBB3-12594
 2014-05-30 15:31:15 +02:00
Joas Schilling
a396b647f3 Merge pull request #2282 from bantu/ticket/12384 
[ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.

* bantu/ticket/12384:
  [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
 2014-05-28 23:30:03 +02:00
Joas Schilling
3021a6e12a Merge pull request #2505 from bantu/ticket/12582-ascraeus 
[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.
 2014-05-28 21:50:19 +02:00
Yuriy Rusko
1d61bcedfd Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 
Conflicts:
	phpBB/docs/hook_system.html
 2014-05-27 21:55:40 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers 
PHPBB3-12594
 2014-05-27 20:51:13 +02:00
Andreas Fischer
a1e31f4389 Merge branch 'ticket/12582' into ticket/12582-ascraeus 
* 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
 2014-05-27 20:38:20 +02:00
Andreas Fischer
ea17a7cc5b [ticket/12592] Make hhvm run MySQL again. 
PHPBB3-12592
 2014-05-26 21:55:44 +02:00
Andreas Fischer
d90da12afc [ticket/12592] Add PHP 5.4 environment using mysql driver. 
PHPBB3-12592
 2014-05-26 19:07:40 +02:00
Andreas Fischer
c0dc0fc09b [ticket/12592] Rename mysql environment to mysqli. 
PHPBB3-12592
 2014-05-26 18:49:29 +02:00
Joas Schilling
d2b783338f [ticket/12470] Correctly set up the php extensions 
PHPBB3-12470
 2014-05-03 10:43:40 +02:00
Joas Schilling
994ab684bc [ticket/12470] Fix setup of phpbb 
PHPBB3-12470
 2014-05-03 10:43:40 +02:00
Joas Schilling
a2ac425688 [ticket/12470] Move setup of phpBB to new .sh 
PHPBB3-12470
 2014-05-03 10:43:39 +02:00
Joas Schilling
5cef3254f7 [ticket/12470] Move setup of database to new .sh 
PHPBB3-12470
 2014-05-03 10:43:39 +02:00
Joas Schilling
acf9524710 [ticket/12470] Move phing sniff into new .sh 
PHPBB3-12470
 2014-05-03 10:43:38 +02:00
Joas Schilling
3b823465db Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12485] Broken tests due to absolute exclude

Conflicts:
	.travis.yml
	phpunit.xml.all
	phpunit.xml.dist
	phpunit.xml.functional
 2014-05-03 10:28:15 +02:00
Nicofuma
3dee1db260 [ticket/12485] Broken tests due to absolute exclude 
PHPBB3-12485
 2014-05-03 04:05:25 +02:00
Joas Schilling
86c073ec3e [feature/sqlite3] Remove invalid comment 
PHPBB3-9728
 2014-05-02 15:45:24 +02:00
Patrick Webster
b39b0369aa [feature/sqlite3] Add support for SQLite 3 
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
 2014-05-02 15:45:20 +02:00
Andreas Fischer
b19ee00b9c [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL. 
HHVM MySQLi has been fixed and works for us now.

PHPBB3-12384
 2014-04-12 01:58:54 +02:00
Joas Schilling
0e2079da85 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
 2014-04-10 13:38:17 +02:00
Andreas Fischer
4d206e2ced [ticket/12320] Install a nightly build of HHVM. 
PHPBB3-12320
 2014-04-10 11:37:25 +02:00
Joas Schilling
23455e92d0 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
 2014-04-03 23:07:58 +02:00
Andreas Fischer
1a044711fb [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise." 
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
 2014-04-03 22:33:46 +02:00
Joas Schilling
7fb65f20da Merge branch 'develop-olympus' into develop-ascraeus 
* 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.
 2014-03-31 20:58:03 +02:00
Andreas Fischer
297729aa32 [ticket/12318] Use MySQL instead of MySQLi for now on HHVM. 
PHPBB3-12318
 2014-03-30 15:43:55 +02:00
Andreas Fischer
e1be4943d8 [ticket/12318] Pin HHVM version to 3.0.0~precise. 
PHPBB3-12318
 2014-03-30 15:43:55 +02:00
Andreas Fischer
d53c411d90 [ticket/12318] Always install new config file on HHVM upgrade conflict. 
PHPBB3-12318
 2014-03-30 15:43:54 +02:00
Andreas Fischer
a53312636a [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04. 
PHPBB3-12318
 2014-03-30 15:43:54 +02:00
Andreas Fischer
672eab3a9c [ticket/12318] Upgrade to a recent stable version of HHVM. 
PHPBB3-12318
 2014-03-30 15:43:54 +02:00
Andreas Fischer
04707cbf8d [ticket/12318] Correctly setup HHVM for functional tests. 
PHPBB3-12318
 2014-03-30 15:43:54 +02:00
Joas Schilling
ada37226bf [ticket/12281] Disable redis on travis until its fixed again 
/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
 2014-03-16 16:36:58 +01:00
Joas Schilling
81c6ca7e4c [ticket/12141] Disable opcache on travis for php 5.5.8 aswell 
PHPBB3-12141
 2014-02-08 12:52:22 +01:00
Andreas Fischer
cb544ed7ae [ticket/12141] Disable broken opcache extension on PHP 5.5.7. 
PHPBB3-12141
 2014-02-04 02:16:36 +01:00
Andreas Fischer
116ff19185 [ticket/11985] Rename install -> setup. This is more generic and consistent. 
PHPBB3-11985
 2014-02-04 00:12:28 +01:00
Andreas Fischer
b16448b3f8 [ticket/11985] Don't try to install APC on PHP 5.5 or higher. 
PHPBB3-11985
 2014-02-03 16:53:15 +01:00
Andreas Fischer
3b6542adf8 [ticket/11985] Enable APC on command line so it can be used by PHPUnit. 
PHPBB3-11985
 2014-02-03 15:33:46 +01:00
Andreas Fischer
a012293462 [ticket/11985] Reorganise travis/install-php-extensions.sh 
PHPBB3-11985
 2014-02-03 15:33:46 +01:00
Nils Adermann
5c5ff6cb7c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11970] Make apt-get less quiet.
  [ticket/11970] Add set -x to Travis setup scripts.
 2013-10-26 10:53:49 -05:00
Andreas Fischer
e65483ac32 [ticket/11970] Make apt-get less quiet. 
PHPBB3-11970
 2013-10-26 01:39:04 +02:00
Andreas Fischer
3c135ccab2 [ticket/11970] Add set -x to Travis setup scripts. 
Output is hidden by Travis by default and this will allow easier debugging.

PHPBB3-11970
 2013-10-26 01:37:03 +02:00
Andreas Fischer
f40f378483 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
 2013-10-25 14:01:41 +02:00
Andreas Fischer
acc6e440d0 [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL. 
PHPBB3-11920
 2013-10-25 13:21:10 +02:00
Andreas Fischer
ecc756e12e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11920] Print MariaDB version after successful setup.
  [ticket/11920] Manually purge mysql-common.
  [ticket/11920] Actually call travis/setup-mariadb.sh.
 2013-10-16 02:17:11 +02:00
Andreas Fischer
5a481bb176 [ticket/11920] Print MariaDB version after successful setup. 
PHPBB3-11920
 2013-10-16 00:25:07 +02:00
Andreas Fischer
0f64f0edc4 [ticket/11920] Manually purge mysql-common. 
PHPBB3-11920
 2013-10-16 00:24:44 +02:00