History | View | Annotate | Download (72.2 kB)
commit bbc531061f4d863ec19a558686ac804a8399f902Merge: cacead0 14fc25bAuthor: Oleg Pudeyev <oleg@bsdpower.com>Date: Sat Feb 26 08:05:55 2011 -0500
Merge branch 'develop-olympus' into develop
commit f50d74506a2334a83e03ae50c65a237d766c7d7eMerge: ec143ed df78a3aAuthor: Andreas Fischer <bantu@phpbb.com>Date: Mon Feb 7 16:32:25 2011 +0100
commit da4617b14b11ade6f664b8c1ab94e3aeb5b7428dMerge: 979158f 3c713b5Author: Igor Wiedler <igor@wiedler.ch>Date: Mon Jan 3 00:24:55 2011 +0100
Merge branch 'ticket/bantu/9746' into develop
commit 541879dc5ce4290d51bf0e888879e3cd9967d1a2Merge: 6e51e52 d4a685aAuthor: Andreas Fischer <bantu@phpbb.com>Date: Wed Dec 29 13:38:22 2010 +0100
Merge branch 'feature/igorw/update-session-api' into develop
commit 442fc61be77787c211650f21b2fb485f5e6ffcf0Merge: 8b9b1f1 b08e0d1Author: Andreas Fischer <bantu@phpbb.com>Date: Thu Dec 16 02:22:17 2010 +0100
Merge branch 'feature/igorw/request-class' into develop
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 a885095897054c91ab68b753ce2a86ae74f2f666Merge: 9a39f55 c2ffa78Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Oct 10 18:39:44 2010 +0200
commit cdadda35540d4909a00de01c1671251684e2801fMerge: 2376f07 41245f9Author: Igor Wiedler <igor@wiedler.ch>Date: Thu Sep 16 23:39:01 2010 +0200
commit e35711ddde8f5e9f94d4b5145662877619ceecd4Merge: 4d5d500 46810f8Author: Igor Wiedler <igor@wiedler.ch>Date: Thu Sep 16 22:42:32 2010 +0200
commit 2e787fa836dbfdcec7864b5f143520aec3752bd0Merge: 999f6db 9731f24Author: Nils Adermann <naderman@naderman.de>Date: Sat Aug 21 23:35:43 2010 +0200
commit 31b221ae913c49fa2e2a776bd9fd54659728fcd0Merge: dea1d66 c79df97Author: Andreas Fischer <bantu@phpbb.com>Date: Thu Jul 8 03:06:41 2010 +0200
commit dea1d660fb63b07451f1a43310de359251462644Author: Nils Adermann <naderman@naderman.de>Date: Fri Jun 25 14:38:53 2010 +0200
[feature/auto-loading] Added autoloader to common and ensured compatability
The autoloader is registered in install without caching, since caching is set...
commit 382354925d59e3da12781f8877ab0a70d0c434d9Merge: d702dba fa9510bAuthor: Nils Adermann <naderman@naderman.de>Date: Sun Apr 4 15:04:56 2010 +0200
commit d702dba75e14a909c165c7ca7a6a87207dcadaafMerge: 2c635b4 d79cff2Author: Nils Adermann <naderman@naderman.de>Date: Fri Mar 26 18:28:48 2010 +0100
commit 8d3cdd5dae42ebec0e4f66ef3e991984054645e7Merge: 9d28bcd 9f8d258Author: Nils Adermann <naderman@naderman.de>Date: Mon Mar 8 00:56:28 2010 +0100
commit 9d28bcd30812e0706536988cb6e43118f3dc5851Author: Nils Adermann <naderman@naderman.de>AuthorDate: Sat Mar 6 04:41:49 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Sat Mar 6 04:41:49 2010 +0100
Make a few functions truly static to fix the tests.
commit 693a2dc99bf07aeac1865d4a48ddf2589317ac7aMerge: b68de23 ac32927Author: Nils Adermann <naderman@naderman.de>AuthorDate: Wed Mar 3 23:32:09 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Wed Mar 3 23:32:09 2010 +0100
Merge branch 'develop-olympus' into develop...
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
Fix getting host for situations where the name/IP is not resolvable. Related to Bug #41025Related revisions: r9387 and r10158
extend r9387 - check for existance of all functions we use...
- fixed bug #44975
Add some very basic checks to the users ip - related to bug #48995
Because we store forwarded_for if the check is activated we need a better check
Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...This feature does not change anything for those not using the constant and this feature is also quite in-flux. We need to test this with some applications and bridges and there may be other locations able to benefit from it.
Fix Bug #49035 - Fix general error while registration, through undefined variable $config in validate_referer (Patch by wjvriend)
Authorised by: bantu
Fallback options for missing language files. (Bug #38575 - Patch by EXreaction)
Fix bug #18005 - Do not add style-parameter to URL again, after admin re-authentification - Patch by leviatan21
Authorised by: AcydBurn
Fixed Bug #45115 - Signature parsing flags are not stored in DBAuthorised by: AcydBurn
Fixed Bug #47145 - [Fix] Correctly check banned users when force password change
Fix bug #46965 - File named install in php directoryAuthorised by: acydburn
add quicktool to remove users from the newly registered special group.
add check to newly registered function to not execute this more than once
- [Feature] New "Newly Registered Users" group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts.- [Feature] Ability to define if the "Newly Registered Users" group will be assigned as the default group to newly registered users....
should fix garbage collection
some corrections, only very minor things.
Okay, a first ci of the new captcha plugins. We'll add dynamic template includes later, as well as documentation on how to use this. I'm prepared to get yelled at for bugs (oh, I know that there are plenty); but please blame spammers for broken styles and MODs.
#44485 - we only send a 503 header if it is a search engine.
do not use spamhaus XBL list - it has too much false positives due to the dynamic IPs
#41575
rollback
encode imageset path in user->img (may not fix any other issues regarding style names with spaces) - #28885
- Add indicator to be used in code if session was created (user visits the site for the first time)- Correctly count topic views for guests visiting the website the first time by entering the topic directly (Bug #43445)
Use FQDN for SMTP EHLO/HELO command. (Bug #41025)
Do not suppress PHP notices/errors in language packs if DEBUG_EXTRA mode enabled. (Bug #41485)
Fix wrong bot ip check if bot ip was wrongly entered by admin. (Bug #42485)
for using the same cached file we need to have exact queries. :P
let us change the time zone and dst setting correctly (related to Bug #38775)
Correctly display future dates (Bug #38755)
Give a small tolerence to timestamps in the future when displaying times as 'minutes ago'
[Change] Performance increase for format_date() (Bug #37575 - Patch by BartVB)[Change] Changed prosilver date separator from 'on' to 'ยป'[Feature] Added 'AGO' setting to relative date strings. For example: posted 14 minutes ago. (Patch by BartVB)[Fix] Extend vertical line for last post column if no posts in forum (Bug #37125)
dsbl.org is no longer actively maintained. Sorry language pack authors. ;)
make topic icon image width/height available to viewforum and search templates (Bug #15934)
gah, thanks chris. :)
add missing dot. :)
more in-depth hostname validation. Not used in install files... there the code is fine.There are ways to improve this, either a whitelist or "more guessing"
Remove a pointless str_replace()
nullar/singular/plural substitution support. At the moment only the added language entry supports this... we may change other language entries later to support this new "approach". Idea from SHS` and Ashe originally.
More to come... (yes, 3.0.x branch, no mistake)
a tiny fix to the language code. ;)
The same way we allow defining a custom template/style path we now allow this for languages too.This will allow applications to define their own language folder for certain parts for example.Callable by $user->set_custom_lang_path({new_path})
Okay. Frozen, we never said anything about it being permafrost. Also, this is not 100% tested, expect troubel with store_db (I'm waiting for the bug reports)
tiny alterations/bugfixes
urlencode image filenames used in img(). This is not needed, but better for XHTML compatibility.
#s29325
#27395
ACP logout
some adjustements (changes to sessions code need to be backwards-compatible) - henry, do not forget to include this into your merge to 3.2.x too.
...
Hmmm. Tawny port and stilton
explanation
27375 - keep it up
So, tighten things up a little further. QA Team, please check this.
it is indeed no longer required
#21255
Hiding everywhere little buggers, eh?
some corrections to let the update work flawlessly.
do not conflict with updates
- some changes to the recent session change- display errors on inserting sessions- fix database updater
This should get rid of the filesorts and temp tables on index (with topic read tracking as exception). Updater still needs testing. Not yet merged to 3.1#22715 - thanks HoL
Minor stuff: #20925, #20815
#19955
#20135
nit rightfully picked
