makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
12167 commits 18 branches 192 tags 207 MiB
Commit graph

12167 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
d48e4b680e [ticket/10729] Fix doc block for user_delete 
PHPBB3-10729
 2014-09-22 00:55:08 +02:00
Oliver Schramm
da6b378e64 [ticket/10729] Update message_edit_user when user being deleted 
PHPBB3-10729
 2014-07-18 00:11:51 +02:00
Oliver Schramm
53f597b6d0 [ticket/10729] Update post_edit_user when user being deleted 
PHPBB3-10729
 2014-07-17 16:28:32 +02:00
Andreas Fischer
a58cc394bc Merge pull request #2716 from marc1706/ticket/12120 
[ticket/12120] Remove imkingdavid from active authors

* marc1706/ticket/12120:
  [ticket/12120] Remove imkingdavid from active authors
 2014-07-11 12:00:02 +02:00
Tristan Darricau
3a11fec5de Merge pull request #2722 from marc1706/ticket/12695 
[ticket/12695] Add viewtopic language file for parse_attachments in mcp_...

* marc1706/ticket/12695:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
 2014-07-10 15:25:00 +02:00
Marc Alexander
83f4bd9ee7 [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post 
PHPBB3-12695
 2014-07-10 14:39:53 +02:00
Marc Alexander
e68094679e [ticket/12120] Remove imkingdavid from active authors 
PHPBB3-12120
 2014-07-08 21:20:51 +02:00
Tristan Darricau
a6d66b2ab0 Merge pull request #2685 from nickvergessen/ticket/12120 
[ticket/12120] Add nicofuma to the developers

* nickvergessen/ticket/12120:
  [ticket/12120] Add nicofuma to the developers
 2014-07-02 22:43:12 +02:00
Joas Schilling
eff07032c0 [ticket/12120] Add nicofuma to the developers 
PHPBB3-12120
 2014-07-02 22:26:32 +02:00
Andreas Fischer
66efb1889d Merge pull request #2662 from dhruvgoel92/ticket/12196 
[ticket/12196] Revert Fix typo "referer" in acp/attachments

* dhruvgoel92/ticket/12196:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
 2014-06-26 23:33:46 +02:00
Dhruv
a730c0291f [ticket/12196] Revert Fix typo "referer" in acp/attachments 
This reverts commit 9bc1f7924d.
https://tracker.phpbb.com/browse/PHPBB3-12196

PHPBB3-12196
 2014-06-27 00:07:15 +05:30
Dhruv
fbbf210747 Merge remote-tracking branch 'nickvergessen/ticket/12196' into develop-olympus 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12196:
  [ticket/12196] Fix typo "referer" in acp/attachments
 2014-06-26 23:23:33 +05:30
Joas Schilling
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments 
PHPBB3-12196
 2014-06-25 23:17:02 +02:00
Andreas Fischer
2596dbc850 Merge pull request #2633 from marc1706/ticket/12755 
[ticket/12755] Add timeout to remote upload to prevent infinite loop

* marc1706/ticket/12755:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
 2014-06-24 20:59:10 +02:00
Marc Alexander
8b3cc9a6c4 [ticket/12755] Apply de morgan to conditional 
PHPBB3-12755
 2014-06-24 19:53:52 +02:00
Marc Alexander
309dbb4ef9 [ticket/12755] Terminate upload loop if upload reaches filesize 
Terminate the upload loop if the expected filesize has been reached instead
of trying to read more bytes until the timeout has been reached.

PHPBB3-12755
 2014-06-24 19:07:49 +02:00
Marc Alexander
5ee1e07e17 [ticket/12755] Change upload in remote_upload() method to fit get_remote_file 
PHPBB3-12755
 2014-06-24 11:53:32 +02:00
Marc Alexander
8817b59377 [ticket/12755] Add language string for timed out remote upload 
PHPBB3-12755
 2014-06-23 20:35:36 +02:00
Marc Alexander
0499655ba4 [ticket/12755] Add timeout to remote upload to prevent infinite loop 
PHPBB3-12755
 2014-06-21 11:55:54 +02:00
Andreas Fischer
51b2cc14f8 Merge pull request #2622 from Nicofuma/ticket/12741 
[ticket/12741] Functional tests on Travis fail since php update last night

* Nicofuma/ticket/12741:
  [ticket/12741] Change the mode of the socket file
 2014-06-19 19:32:21 +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
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