mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 19:45:10 +01:00
Code Issues Releases Wiki Activity
12,147 Commits 17 Branches 190 Tags
Commit Graph

12147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andreas Fischer
d2aee6d2ea Merge pull request #2608 from dhruvgoel92/ticket/12720 
[ticket/12720] Allow commit heading to begin with lowercase letters

* dhruvgoel92/ticket/12720:
  [ticket/12720] Allow commit heading to begin with lowercase letters
 2014-06-16 15:28:25 +02:00
Dhruv
6db849cba5 [ticket/12720] Allow commit heading to begin with lowercase letters 
PHPBB3-12720
 2014-06-16 18:55:19 +05:30
Dhruv Goel
233cdbfd66 Merge pull request #2548 from bantu/ticket/12660 
[ticket/12660] Improve check for when phpinfo() is disabled.
 2014-06-09 13:22:15 +05:30
Andreas Fischer
a0c442d16e [ticket/12660] Improve check for when phpinfo() is disabled. 
PHPBB3-12660
 2014-06-09 03:28:57 +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
f09799322e Merge pull request #2498 from bantu/ticket/12582 
[ticket/12582] Strip away copyrighted ICC profile from images

* bantu/ticket/12582:
  [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:49:54 +02:00
Andreas Fischer
de71837b71 [ticket/12582] Fix coding style. 
PHPBB3-12582
 2014-05-27 20:56:29 +02:00
Andreas Fischer
d7c143da24 [ticket/12582] Remove set -e due to exiftool not liking 0 byte files. 
PHPBB3-12582
 2014-05-27 20:51:48 +02:00
David Prévot
b485318ba9 [ticket/12582] Strip away copyrighted ICC profile 
This images embed a non free ICC profile that doesn’t allow
modification:

http://web.archive.org/web/20020603153925/srgb.com/usingsrgb.html

Please use the proposed version stripping away this copyrighted binary
profile, probably embedded by an image software at one time:

	exiftool -icc_profile"-<=" phpBB/adm/images/phpbb_logo.png

I’ve checked the resulting image and trust it is identical to the
original.

Some more background on the issue:
https://lists.debian.org/debian-devel/2014/05/msg00339.html

PHPBB3-12582
 2014-05-27 18:35:44 +02:00
Andreas Fischer
c02fba3f1c [ticket/12582] Change strip_icc_profiles.sh to only take a single file. 
PHPBB3-12582
 2014-05-27 17:23:54 +02:00
Andreas Fischer
4f9aa5e384 [ticket/12582] Run strip_icc_profiles.sh on Travis CI. 
PHPBB3-12582
 2014-05-27 17:23:54 +02:00
Andreas Fischer
ac3bc45874 [ticket/12582] Overwrite inplace instead of creating _original files. 
PHPBB3-12582
 2014-05-27 17:23:54 +02:00
Andreas Fischer
af05015a69 [ticket/12582] Add script for strippping ICC profiles from images. 
PHPBB3-12582
 2014-05-27 13:13:29 +02:00
Joas Schilling
ac3e0e53b2 Merge pull request #2470 from bantu/task/sami 
[task/sami] Add Sami to composer dependencies and build script

* bantu/task/sami:
  [task/sami] Establish alphabetical order.
  [task/sami] Also ignore ext/ directory.
  [task/sami] Replace phpdoctor with sami.
  [task/sami] Add sami/sami as a composer development dependency.
 2014-05-18 18:56:52 +02:00
Andreas Fischer
223058c8c6 [task/sami] Establish alphabetical order. 
PHPBB3-12495
 2014-05-17 13:05:52 +02:00
Andreas Fischer
6a97d9f855 [task/sami] Also ignore ext/ directory. 
PHPBB3-12495
 2014-05-17 13:04:25 +02:00
Andreas Fischer
f08f283143 [task/sami] Replace phpdoctor with sami. 
PHPBB3-12495
 2014-05-16 17:56:03 +02:00
Andreas Fischer
b32f91b9c6 [task/sami] Add sami/sami as a composer development dependency. 
PHPBB3-12495
 2014-05-16 17:55:41 +02:00
Andreas Fischer
f2500da8ec Merge pull request #2454 from nickvergessen/ticket/12540 
[ticket/12540] Fix broken placeholders in language files

* nickvergessen/ticket/12540:
  [ticket/12540] Fix broken placeholders in language files
 2014-05-15 13:36:06 +02:00
Joas Schilling
dceea23b1f [ticket/12540] Fix broken placeholders in language files 
PHPBB3-12540
 2014-05-13 21:41:11 +02:00
Andreas Fischer
cc0446dc17 Merge pull request #2430 from nickvergessen/ticket/10839-olympus 
[Ticket/10839] olympus - Remove phpunit configuration files

* nickvergessen/ticket/10839-olympus:
  [ticket/10839] Fix note about running slow tests and build task
  [ticket/10839] Removing phpunit.xml.all
  [ticket/10839] Always run functional tests by default
 2014-05-10 17:14:00 +02:00
Joas Schilling
333120a992 [ticket/10839] Fix note about running slow tests and build task 
PHPBB3-10839
 2014-05-09 11:19:49 +02:00
Joas Schilling
8a9b1a8fed [ticket/10839] Removing phpunit.xml.all 
To run all tests, just append
    --group slow
to your call

PHPBB3-10839
 2014-05-09 11:19:48 +02:00
Joas Schilling
d6ac4a1130 [ticket/10839] Always run functional tests by default 
They are skipped anyway, if $phpbb_functional_url is not configured.
If you want to run tests without functional tests, just append
    --exclude-group functional
to your call

PHPBB3-10839
 2014-05-09 11:19:48 +02:00
Joas Schilling
436e388b87 Merge pull request #2396 from Nicofuma/ticket/12485 
[ticket/12485] Broken tests due to absolute 'exclude'

* Nicofuma/ticket/12485:
  [ticket/12485] Broken tests due to absolute exclude
 2014-05-03 10:19:52 +02:00
Nicofuma
3dee1db260 [ticket/12485] Broken tests due to absolute exclude 
PHPBB3-12485
 2014-05-03 04:05:25 +02:00
Nils Adermann
af7ec71967 Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympus 
* github-bantu/ticket/11860:
  [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
 2014-05-03 00:37:11 +02:00
Nils Adermann
7b94368d52 Merge remote-tracking branch 'github-bantu/ticket/12429' into develop-olympus 
* github-bantu/ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
 2014-05-02 21:42:54 +02:00
Andreas Fischer
30dc3afb69 [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3. 
PHPBB3-12429
 2014-05-02 20:19:10 +02:00
Nils Adermann
1cd2aaf92f Merge remote-tracking branch 'github-nickvergessen/ticket/12472' into develop-olympus 
* github-nickvergessen/ticket/12472:
  [ticket/12472] Set fast_finish for travis
 2014-05-02 18:58:15 +02:00
Marc Alexander
cb2538dc84 Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympus 
* nickvergessen/ticket/12120:
  [ticket/12120] Add Marc Alexander to AUTHORS
 2014-05-02 18:36:08 +02:00
Joas Schilling
acdaad2625 [ticket/12472] Set fast_finish for travis 
Now, a build will finish as soon as a job has failed,
or when the only jobs left allow failures.
http://docs.travis-ci.com/user/build-configuration/#Fast-finishing

PHPBB3-12472
 2014-05-02 17:59:22 +02:00
Joas Schilling
797cb02f06 [ticket/12120] Add Marc Alexander to AUTHORS 
PHPBB3-12120
 2014-05-02 17:12:44 +02:00
Nils Adermann
c7450592d8 Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympus 
* github-bantu/ticket/12468:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
 2014-05-02 15:36:59 +02:00
Andreas Fischer
370015c1a5 [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'. 
PHPBB3-12468
 2014-05-02 14:41:08 +02:00
Andreas Fischer
43c6fd768f Merge pull request #2371 from nickvergessen/ticket/12467 
[ticket/12467] Add config*.php and tests_config*.php to .gitignore

* nickvergessen/ticket/12467:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
 2014-05-02 14:21:54 +02:00
Joas Schilling
535cd5670f [ticket/12467] Add config*.php and tests_config*.php to .gitignore 
PHPBB3-12467
 2014-05-02 13:47:30 +02:00
Nils Adermann
fa230b48ec Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into develop-olympus 
* github-marc1706/ticket/8960-olympus:
  [ticket/8960] Allow changing avatar path if it's not writable
 2014-05-02 13:25:29 +02:00
Joas Schilling
06e9d8871c Merge pull request #2319 from n-aleha/ticket/12186 
[ticket/12186] Move PM reports below post reports while installing

* n-aleha/ticket/12186:
  [ticket/12186] Move PM reports below post reports while installing
 2014-04-29 21:28:54 +02:00
n-aleha
5a91399dac [ticket/12186] Move PM reports below post reports while installing 
In mcp, move PM reports below post reports while installing.

PHPBB3-12186
 2014-04-23 22:43:20 +03:00
Andreas Fischer
c0f3011b53 Merge pull request #2341 from nickvergessen/ticket/12413 
[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

* nickvergessen/ticket/12413:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
 2014-04-22 19:24:43 +02:00
Joas Schilling
f9cdec90fc [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"

This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing
changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f.

PHPBB3-12413
 2014-04-22 18:55:17 +02:00
Joas Schilling
d735129d6e Merge pull request #2324 from bantu/ticket/12417 
[ticket/12417] Revert "No longer allow Travis CI HHVM environment to fai...

* bantu/ticket/12417:
  [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
 2014-04-16 22:46:41 +02:00
Andreas Fischer
04893e3f98 [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail." 
hhvm-nightly 2014.04.16~precise introduced "Attempted to serialize
unserializable builtin class DOMElement" errors when running functional tests.

This reverts commit ff7cc77f9db66b7fddacd77f215d85cf0243b2fa.

PHPBB3-12417
 2014-04-16 22:16:52 +02:00
Andreas Fischer
e9807e1741 Merge pull request #2310 from n-aleha/ticket/12397 
[ticket/12397] Fix sql_unique_index_exists doc block

* n-aleha/ticket/12397:
  [ticket/12397] Fix sql_unique_index_exists doc block
 2014-04-15 23:59:39 +02:00
n-aleha
bff63be512 [ticket/12397] Fix sql_unique_index_exists doc block 
db_tools::sql_unique_index_exists() searches for unique indexes but not
primary key indexes.

PHPBB3-12397
 2014-04-16 00:55:05 +03:00
Joas Schilling
675cef9c2e Merge pull request #2195 from Elsensee/ticket/10423 
[ticket/10423] Remove * from search or highlight string

* Elsensee/ticket/10423:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
 2014-04-15 23:23:26 +02:00
Oliver Schramm
f3cd7f73e1 [ticket/10423] Replace foreach with function in viewtopic.php 
PHPBB3-10423
 2014-04-15 20:43:16 +02:00
Oliver Schramm
601ecd3da1 [ticket/10423] Remove unnecessary include in test 
PHPBB3-10423
 2014-04-15 20:43:01 +02:00