History | View | Annotate | Download (26.8 kB)
commit 8a54d8850932a22c9d808973572b29d82a7a2dd2Merge: 7074d19 c910ce1Author: Andreas Fischer <bantu@phpbb.com>Date: Fri Apr 8 12:24:59 2011 +0200
Merge branch 'develop-olympus' 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
Merge branch 'feature/igorw/request-class' into develop
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
Fixed bugs #43145, #44375, #44415 and #43045
- Add hard limit for smilies
ok, i misread this one. :) related to r9763
A small correction to #r9763
- Add pagination for icons and smilies in the ACP and smilies in the smiley popup
Sort topic icons/smilies by filename when adding new topics/smilies (Bug #13501)
#26705
Hiding everywhere little buggers, eh?
#19675and#19675
Language changes, so take care.
I guess it's time to close up shop :)
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
make sure we always check for a valid directory handle
dumdidum... sorry. ;)
#14559
#i62 - #i65gone through every javascript invocation and making sure we adhere to our coding guidelines.
#13968
Language changes, take them while they are hot.#13295
Introducing some changes to acp_icons. This adds language variables.The JS candy is mostly only for firefox, the actual fix is splitting the list.
#13917#13911
+ some fixes
try to normalize everything...
#13199
#12461
adjust smilies. Also allow adding more codes to existing smilies... no one noticed this before. :/
changed the cache files to save some memory (all global ones are hold in memory, doubling it).
some changes/bugfixes
some tiny bugfixes and changed is_active() a bit...
adjust text for getting image dimensions as well as not suppressing warnings for getimagesize()
- should fix some Firebird issues ( can't believe that nobody found this until now )
#6772- some other random things
fix for bug #6742
Unused Code inside function update_forum_data [Bug #6606]Copy permissions protection for groups [Bug #6594]HTML issues in ACP [Bug #6580, #6578]Always send the correct encoding [related to bug #6576]Mass email fixes for first loop iteration [Bug #6570]...
some updater changes as well as tiny bugfixes
- store sql_layer directly within the layer itself- new method sql_multi_insert to circumvent db-specific hacks(hopefully not introduced any parsing errors)
some fixes
- some bugfixes- using E_USER_WARNING if an error occurred within the ACP (sadly not able to use it as a default for trigger_error - it seems to be hardcoded in PHP)
re-allow editing icons and smilies. :/
- load tracking updates. Need to be tested on a clean installation too - at the moment only tiny quirks are noticed at area51.- reported bugs fixed
some bugfixes
- removed db cache (might re-appear, but for now we do not see the need for it)- all changes to styles/subsilver/template are purely cosmetic (no functional changes)- cosmetics- bugfixes- add index to modules table- use modules ordering code for forums too
make sure custom profile fields are created correctly on registration (#2225)
ok, this one is rather large... the most important change:re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different
apart from this, code cleanage, bug fixing, etc.
- remove description from profile fields- added disclaimer about DEBUG_EXTRA to the ACP (i think this is needed - some idiots might think it is wise to have this enabled on a production board. :) We may let it there for the Betas though, but it will be removed during the RC's)...
- actually let the user import smilies/icons paks. ;)- fix TRUNCATE TABLE syntax (mssql does not understand TRUNCATE alone)
- fix moving up/down for smilies and icons- display number of total topics in viewforum for forums having active topics set to to true
- Bug 1301
ok, thought about this now for too long. I think the best solution circumventing memory consumption and not introducing "hacks" is to seperate module information (and probably more in 3.2 for installation/uninstallation) from the main code.
adjusting sql_freeresult a bit as well as our error handler (it now prints out if it is because of DEBUG_EXTRA being defined - which is not enabled within the betas/rc's and stable releases).
- a bunch of bugfixes. :P
- adding ability to assign moderator specific ban options- fixing destroying of sql caches- fixing referencing of sql cached queries if more than one are active on one page- other fixes
- fix some tiny bugs- fix module system (sometimes the layout is broken due to falsly deactivated categories)- auth updates (setting permissions)- fix "category jumping" bug in acp- u_action is defined by the module itself
- more acp additions and changes...
