History | View | Annotate | Download (3.8 kB)
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
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
Mass Email works again for users with empty jabber address but notification set to 'both'. (Bug #39755)
Make sure users still get notifications if they set to only be notified by Jabber, but Jabber service disabled. (Bug #29715 - Patch by Paul)
Hiding everywhere little buggers, eh?
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
dumdidum... sorry. ;)
Cleanup in aisle 15
Ok, here comes a big one. Poor updater. Also requires testing.
#i91#i92#i93#i94#i95#i96
fixing some bugs
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
small changes - mostly style related to fix cross-browser issues.
oi^2
hopefully not too late in the game. Checked in new jabber class (the class done by the flyspray project). It would be nice if this could be tested with more servers - jabber.org seems to work fine...- other fixes
fix for bug #6140 (jabber not working)
#5488
- extend config checking to include check for writeable path- removed not utilized user_allow_email column from schema- removed inactive groups (they had no use at all, since inactive users are not able to login) The only benefit those brought are distinguish users - but this is no longer needed too due to the inactive code present. This also allows us to retain group memberships as well as default settings for users being set inactive due to profile changes....
- 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)
hey dev team mates, here are the brand new beta checkins (as promised). Please ensure this stays in our private cvs until the 23rd June, except the bug fixes.
- 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
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.
some tiny changes...
#1304, #1335, #1336
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.
- Bug 1177
- 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
my turn to break things... harharhar- checking in permission settings and permission masks- permission presets and documentation not finished yet- added backtrace function to determine file/line for sql errors- fixed marlist for orphan attachments/groups/logs/users...
- drop in the new administration panel- not finished yet: some user related items, style admin, database admin and permissions- Graham: Please add your MCP schema data to the schema data file. ;)
- some SQL:2003 changes (basicly joins, mysql5 is sql:2003 compliant in strict mode now) - postgresql not supporting this standard. :/- acp changes
- more acp additions and changes...
HOLLA! Whats this shit...These gets commited now because i want to be sure no one is changing an admin file corresponding the ones listed within includes/acp
