History | View | Annotate | Download (9.3 kB)
commit cf5253c7b8407b7ff1c998aae9408c112b90cf05Merge: ba41e45 5e2bbdbAuthor: Andreas Fischer <bantu@phpbb.com>Date: Thu Feb 24 10:54:51 2011 +0100
Merge branch 'develop-olympus' into develop
commit 8f0e9aee5ce518937b7ed05c2cd602e85e5b0b8aMerge: 2e31dd5 4270705Author: Igor Wiedler <igor@wiedler.ch>Date: Sat Feb 12 19:55:23 2011 +0100
commit a3673789402eae83b94860c87747091125701f78Merge: 30dacf8 f115795Author: Andreas Fischer <bantu@phpbb.com>Date: Wed Jan 12 01:49:44 2011 +0100
Merge branch 'task/naderman/config-class' into develop
commit 95c683056b85399200e2caaa9aa65edc6843c16fMerge: 5373f81 1aef7ebAuthor: Igor Wiedler <igor@wiedler.ch>Date: Sun Jan 9 23:58:27 2011 +0100
Merge branch 'task/acm-refactor' into develop
Conflicts: tests/bootstrap.php
commit adfa1656fb9d8b5bb601af1d7a6720884954d87aMerge: bd579c8 af5b9a9Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 16:35:55 2010 +0100
Merge branch 'ticket/igorw/9556' into develop
commit 1d81671b7e2f8458456fef064c261e3c0370143aMerge: 265da34 0f49e52Author: Igor Wiedler <igor@wiedler.ch>Date: Mon Oct 25 22:12:24 2010 +0200
Merge branch 'ticket/bantu/9627' into develop
commit 9a39f55c24fee8fe817823097e8f596b92ab7049Merge: 798e62b 5625df3Author: Igor Wiedler <igor@wiedler.ch>Date: Mon Oct 4 17:26:00 2010 +0200
Merge branch 'ticket/bantu/9792' into develop
commit e35711ddde8f5e9f94d4b5145662877619ceecd4Merge: 4d5d500 46810f8Author: Igor Wiedler <igor@wiedler.ch>Date: Thu Sep 16 22:42:32 2010 +0200
commit 0245ac581e24ddc7fa2288ccd24db9671a1efe31Merge: e4ff780 bb4eb41Author: Nils Adermann <naderman@naderman.de>Date: Mon Aug 30 00:20:21 2010 +0200
commit 2e787fa836dbfdcec7864b5f143520aec3752bd0Merge: 999f6db 9731f24Author: Nils Adermann <naderman@naderman.de>Date: Sat Aug 21 23:35:43 2010 +0200
commit 2cf57822bb4607d595affaef2264f064cb984c55Merge: 904d204 8f91e6cAuthor: Nils Adermann <naderman@naderman.de>Date: Sun May 30 14:59:06 2010 +0200
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)
#26145
Some changes to the SAPI detection. The weird fact that it doesn't work without remains.
Flash files do not display anymore after update to flash player 10 (Bug #41315)
Fix download count increments for image attachments without corresponding thumbnails. (Bug #42505)
can't they decide on one single thing...
#38995
Getting ready for IE8 which finally improves security a bit. Let's allow our users to benefit from that
close db connection before delivering file. Also make sure connection can't be closed twice.
Let's try to keep the lid on the jar
enable stupid php.ini fallback for readfile (#30325 - fix by bellzebu)
forgot a few things
Mylek is right - we should do this. Fixes some aspects of file.php, needs testing.
add PHPBB_INSTALLED check to file.php too
Hiding everywhere little buggers, eh?
Forbidden should have an uppercase F
#s23535
#19955
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
erm, yes.
Hopefully fixes avatar caching for CGI installs.
hrm - let's try this.
Nothing we can do about IE 6, but this should reduce the bandwidth need significantly.
fix download location for img wrap
ups, seems i really forgot to change this. :)
#i8